diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-26 14:39:32 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-02 09:35:15 +0200 |
| commit | 68d9840cf20f61ef85b4a9e7b12d5327533473fe (patch) | |
| tree | 8f535f632609c0881a983001b4670798f9cb1b3e | |
| parent | 7d2d54ef0d605e4bc8fcc89fe3bb40530b6a7553 (diff) | |
| download | gitlab-ce-pawel/fix-condition-for-setting-default-metrics-folder-for-dev-and-test.tar.gz | |
Add information that support for prometheus_multiproc_dir env variable will be deprecated with GitLab 9.5 and removed in 10pawel/fix-condition-for-setting-default-metrics-folder-for-dev-and-test
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 | ||||
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 1 | ||||
| -rw-r--r-- | doc/administration/monitoring/prometheus/gitlab_metrics.md | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 0a9a104f7f6..f6fc1c2727f 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -333,7 +333,7 @@ .help-block %strong.cred WARNING: %code monitoring.prometheus.multiprocess_files_dir - setting is not valid or directory it points to is not accessible. + setting is not valid or the directory it points to is not accessible. = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory') %fieldset diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 3f748c6df56..a2f8421f5d7 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -10,4 +10,3 @@ Prometheus::Client.configure do |config| config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir') end end - diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md index 0fdc815b27c..2936f40dc81 100644 --- a/doc/administration/monitoring/prometheus/gitlab_metrics.md +++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md @@ -60,7 +60,8 @@ directory will be automatically configured. If GitLab is installed from source its location can be configured in `gitlab.yml`. -Using environment variable `prometheus_multiproc_dir` to configure the location has been deprecated in GitLab 9.5. +Using environment variable `prometheus_multiproc_dir` to configure the location has been deprecated in GitLab 9.5 +and will be removed in GitLab 10 [← Back to the main Prometheus page](index.md) |