diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-06-15 22:00:48 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-19 09:42:11 -0500 |
| commit | fbbe225aa8ac46f746b7b81d74c41edd6c495c86 (patch) | |
| tree | 52f74b63a5f05d26793b390eb1893dfebcb526b4 | |
| parent | ea46d818986d512878fb686166f8504e852c3147 (diff) | |
| download | gitlab-ce-fbbe225aa8ac46f746b7b81d74c41edd6c495c86.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 d552704df88..280c5930f3d 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -299,8 +299,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') |