diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-17 13:37:47 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-17 13:37:47 +0000 |
| commit | 55f6b1ed74f303e2b8812437b4ae5226599562d7 (patch) | |
| tree | dee77032b6e689d2cc14f83a9e1c7f17b1279dc9 | |
| parent | 576ed6057690269538a76b8d788eb0d77e1fda9c (diff) | |
| parent | 94a6c0ded0e1d938c92510f2c4fbb343e1e885a9 (diff) | |
| download | gitlab-ce-55f6b1ed74f303e2b8812437b4ae5226599562d7.tar.gz | |
Merge branch 'update-admin-health-page' into 'master'
Update admin health page with the application readiness endpoints
Closes #31359
See merge request !11388
| -rw-r--r-- | app/views/admin/health_check/show.html.haml | 19 | ||||
| -rw-r--r-- | changelogs/unreleased/update-admin-health-page.yml | 5 |
2 files changed, 10 insertions, 14 deletions
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index 6a208d76a38..4deccf4aa93 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/app/views/admin/health_check/show.html.haml @@ -16,24 +16,15 @@ = icon('spinner') Reset health check access token %p.light - Health information can be retrieved as plain text, JSON, or XML using: + Health information can be retrieved from the following endpoints. More information is available + = link_to 'here', help_page_path('user/admin_area/monitoring/health_check') %ul %li - %code= health_check_url(token: current_application_settings.health_check_access_token) + %code= readiness_url(token: current_application_settings.health_check_access_token) %li - %code= health_check_url(token: current_application_settings.health_check_access_token, format: :json) + %code= liveness_url(token: current_application_settings.health_check_access_token) %li - %code= health_check_url(token: current_application_settings.health_check_access_token, format: :xml) - - %p.light - You can also ask for the status of specific services: - %ul - %li - %code= health_check_url(token: current_application_settings.health_check_access_token, checks: :cache) - %li - %code= health_check_url(token: current_application_settings.health_check_access_token, checks: :database) - %li - %code= health_check_url(token: current_application_settings.health_check_access_token, checks: :migrations) + %code= metrics_url(token: current_application_settings.health_check_access_token) %hr .panel.panel-default diff --git a/changelogs/unreleased/update-admin-health-page.yml b/changelogs/unreleased/update-admin-health-page.yml new file mode 100644 index 00000000000..51aa6682b49 --- /dev/null +++ b/changelogs/unreleased/update-admin-health-page.yml @@ -0,0 +1,5 @@ +--- +title: Added application readiness endpoints to the monitoring health check admin + view +merge_request: +author: |