diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-25 22:50:02 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-02 09:31:27 +0200 |
| commit | 7d2d54ef0d605e4bc8fcc89fe3bb40530b6a7553 (patch) | |
| tree | c0779b4e55e98f97d117aca433d3bf736490ba28 | |
| parent | dcd460f3b25b89de7bf078d5f6b4e63196df19c7 (diff) | |
| download | gitlab-ce-7d2d54ef0d605e4bc8fcc89fe3bb40530b6a7553.tar.gz | |
Update message text to reflect that multiproc dir setting is not properly configured.
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/pawel-fix-condition-for-setting-default-metrics-folder-for-dev-and-test.yml | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 8bb2a563990..0a9a104f7f6 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -332,9 +332,8 @@ - unless Gitlab::Metrics.metrics_folder_present? .help-block %strong.cred WARNING: - Environment variable - %code prometheus_multiproc_dir - does not exist or is not pointing to a valid directory. + %code monitoring.prometheus.multiprocess_files_dir + setting is not valid or 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/changelogs/unreleased/pawel-fix-condition-for-setting-default-metrics-folder-for-dev-and-test.yml b/changelogs/unreleased/pawel-fix-condition-for-setting-default-metrics-folder-for-dev-and-test.yml new file mode 100644 index 00000000000..eae95df3ee8 --- /dev/null +++ b/changelogs/unreleased/pawel-fix-condition-for-setting-default-metrics-folder-for-dev-and-test.yml @@ -0,0 +1,4 @@ +--- +title: Add ability to set prometheus metrics client data dir from gitlab.yml +merge_request: 13008 +author: |