diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-06-15 22:00:48 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-06-15 22:00:48 +0000 |
| commit | ae9d191e566b036798816e5f8bf5ef1dc0ff3e90 (patch) | |
| tree | 4e641b2a93f89dad06ab1daa561836043ee66f34 | |
| parent | f18424819d30b64b79915d60c800d800279ab8ea (diff) | |
| parent | bee448730dff213e37983c7d05cec303f6fb6e94 (diff) | |
| download | gitlab-ce-ae9d191e566b036798816e5f8bf5ef1dc0ff3e90.tar.gz | |
Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'
Update ruby metrics endpoint text to be clearer
See merge request !12157
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 5 |
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') |