Support token header for health check token, and general cleanup of the health_check feature.

1 files changed, 21 insertions, 15 deletions

diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml
index 23a931995ab..ed7025f7a0b 100644
--- a/app/views/admin/health_check/show.html.haml
+++ b/app/views/admin/health_check/show.html.haml
@@ -2,29 +2,35 @@
 
 %h3.page-title
   Health Check
-%p.light
+.bs-callout.clearfix
+  .pull-left
+    %p
   Access token is
-  %code{ id:'health-check-token' }= "#{current_application_settings.health_check_access_token}"
+  %code#health-check-token= current_application_settings.health_check_access_token
+  = button_to reset_health_check_token_admin_application_settings_path,
+    method: :put, class: 'btn btn-default',
+    data: { confirm: 'Are you sure you want to reset the health check token?' } do
+    = icon('refresh')
+    Reset health check access token
 %p.light
   Health information can be reteived as plain text, json, or xml using:
   %ul
     %li
-      %code= "/health_check?token=#{current_application_settings.health_check_access_token}"
+      %code= health_check_url(token:current_application_settings.health_check_access_token)
     %li
-      %code= "/health_check.json?token=#{current_application_settings.health_check_access_token}"
+      %code= health_check_url(token:current_application_settings.health_check_access_token, format: :json)
     %li
-      %code= "/health_check.xml?token=#{current_application_settings.health_check_access_token}"
+      %code= health_check_url(token:current_application_settings.health_check_access_token, format: :xml)
 
-.bs-callout.clearfix
-  .pull-left
-    %p
-      You can reset the health check access token by pressing the button below.
-    %p
-      = button_to reset_health_check_token_admin_application_settings_path,
-        method: :put, class: 'btn btn-default',
-        data: { confirm: 'Are you sure you want to reset the health check token?' } do
-        = icon('refresh')
-        Reset health check access token
+%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)
 
 %hr
 .panel.panel-default