diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-20 13:42:02 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-20 13:42:02 +0000 |
| commit | eabc786a64aa0a93e5078820c6252d0f5ccc5b06 (patch) | |
| tree | cc1be55935a3d1beacd90d04bb2060405e1c6f36 /app/views/admin | |
| parent | 6a3049d589fdfcc1eacc7065669f305741a09a0b (diff) | |
| parent | 5f2dc999bd5dbcf9707c7e5a89e2e18ec419bb2d (diff) | |
| download | gitlab-ce-eabc786a64aa0a93e5078820c6252d0f5ccc5b06.tar.gz | |
Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' into 'master'
Do not enable prometheus metrics when metrics folder is missing
See merge request !12263
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 95dffdafabe..b21d5665970 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -325,6 +325,10 @@ = f.label :prometheus_metrics_enabled do = f.check_box :prometheus_metrics_enabled Enable Prometheus Metrics + - unless Gitlab::Metrics.metrics_folder_present? + .help-block + %strong.cred WARNING: + Environment variable `prometheus_multiproc_dir` does not exist or is not pointing to a valid directory. %fieldset %legend Background Jobs |