summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-05-22 13:44:33 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-06-02 19:45:58 +0200
commit57902dbe826e0fd1db0a33662cafbef66b060ce2 (patch)
tree12725d9054cff8873465c59b3d0ab4caab311d75
parentdc4d4c18bdb2a0138ebb05496c14738a9304d1e8 (diff)
downloadgitlab-ce-57902dbe826e0fd1db0a33662cafbef66b060ce2.tar.gz
Add Changelog fix textual description in config.ru
-rw-r--r--changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml4
-rw-r--r--config.ru2
2 files changed, 5 insertions, 1 deletions
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__)