summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-06-15 22:00:47 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-06-15 22:00:47 +0000
commitbee448730dff213e37983c7d05cec303f6fb6e94 (patch)
tree4e641b2a93f89dad06ab1daa561836043ee66f34 /app/views/admin/application_settings
parentf18424819d30b64b79915d60c800d800279ab8ea (diff)
downloadgitlab-ce-bee448730dff213e37983c7d05cec303f6fb6e94.tar.gz
Update ruby metrics endpoint text to be clearer
Diffstat (limited to 'app/views/admin/application_settings')
-rw-r--r--app/views/admin/application_settings/_form.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 0383c7ce546..95dffdafabe 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -313,8 +313,9 @@
%fieldset
%legend Metrics - Prometheus
%p
- Setup Prometheus to measure a variety of statistics that partially overlap and complement Influx based metrics.
- This setting requires a
+ 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
+ = link_to 'here', admin_health_check_path
+ \. This setting requires a
= link_to 'restart', help_page_path('administration/restart_gitlab')
to take effect.
= link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction')