diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-15 23:41:47 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-19 18:52:23 +0200 |
| commit | ed5c7d11b19c9507206ada5c6e12eef477370fa9 (patch) | |
| tree | bfcc3cf34e741d558645821e486ecabc73c507e2 /app/views | |
| parent | a4a5cbf29a983d05b5fc69f8e63fc37e100c8637 (diff) | |
| download | gitlab-ce-ed5c7d11b19c9507206ada5c6e12eef477370fa9.tar.gz | |
Do not enable prometheus metrics when data folder is not present.
+ Set defaults correctly only for when not in production or staging
+ set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru
Test prometheus metrics unmemoized
Diffstat (limited to 'app/views')
| -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 |