From 57902dbe826e0fd1db0a33662cafbef66b060ce2 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 22 May 2017 13:44:33 +0200 Subject: Add Changelog fix textual description in config.ru --- .../29118-add-prometheus-instrumenting-to-gitlab-webapp.yml | 4 ++++ config.ru | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml diff --git a/changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml b/changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml new file mode 100644 index 00000000000..99c55f128e3 --- /dev/null +++ b/changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml @@ -0,0 +1,4 @@ +--- +title: Add prometheus based metrics collection to gitlab webapp +merge_request: +author: diff --git a/config.ru b/config.ru index 9e474a7c08c..cac4cf10c36 100644 --- a/config.ru +++ b/config.ru @@ -14,7 +14,7 @@ if defined?(Unicorn) use Unicorn::WorkerKiller::Oom, min, max end end -# set default for multiproces metrics gathering +# set default directory for multiproces metrics gathering ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_data_dir' require ::File.expand_path('../config/environment', __FILE__) -- cgit v1.2.3