summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings/_form.html.haml
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-07-19 00:50:25 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-07-20 10:18:06 +0200
commitd4df306b07595576d65a7a836c50c9d34fd73a49 (patch)
tree823ce714979552c651a6d755c824268c835bb270 /app/views/admin/application_settings/_form.html.haml
parent3786c4d3bdd78250cdd5d56e6add24808fd9ced7 (diff)
downloadgitlab-ce-d4df306b07595576d65a7a836c50c9d34fd73a49.tar.gz
Documentation and link to explanation of prometheus_multiproc_dirpawel/prometheus_multiproc_dir_documentation
- Change the wording a little bit
Diffstat (limited to 'app/views/admin/application_settings/_form.html.haml')
-rw-r--r--app/views/admin/application_settings/_form.html.haml15
1 files changed, 10 insertions, 5 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 26f7c1a473a..8bb2a563990 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -315,7 +315,9 @@
%fieldset
%legend Metrics - Prometheus
%p
- Enable a Prometheus metrics endpoint at `#{metrics_path}` to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available
+ Enable a Prometheus metrics endpoint at
+ %code= metrics_path
+ to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available
= link_to 'here', admin_health_check_path
\. This setting requires a
= link_to 'restart', help_page_path('administration/restart_gitlab')
@@ -327,10 +329,13 @@
= 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.
+ - 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.
+ = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
%fieldset
%legend Profiling - Performance Bar