diff --git a/app/assets/javascripts/app/controllers/monitoring.coffee b/app/assets/javascripts/app/controllers/monitoring.coffee index 2601628b8..b483057bd 100644 --- a/app/assets/javascripts/app/controllers/monitoring.coffee +++ b/app/assets/javascripts/app/controllers/monitoring.coffee @@ -4,7 +4,7 @@ class Index extends App.ControllerSubContent events: 'click .js-resetToken': 'resetToken' 'click .js-select': 'selectAll' - 'click .js-restartDeadJobs': 'restartDeadJobs' + 'click .js-restartFailedJobs': 'restartFailedJobs' constructor: -> super @@ -46,12 +46,12 @@ class Index extends App.ControllerSubContent @load() ) - restartDeadJobs: (e) => + restartFailedJobs: (e) => e.preventDefault() @ajax( - id: 'restart_dead_jobs_request' + id: 'restart_failed_jobs_request' type: 'POST' - url: "#{@apiPath}/monitoring/restart_dead_jobs" + url: "#{@apiPath}/monitoring/restart_failed_jobs" success: (data) => @job_restart_count = data.job_restart_count @render() diff --git a/app/assets/javascripts/app/views/monitoring.jst.eco b/app/assets/javascripts/app/views/monitoring.jst.eco index 247513122..5619b15b6 100644 --- a/app/assets/javascripts/app/views/monitoring.jst.eco +++ b/app/assets/javascripts/app/views/monitoring.jst.eco @@ -35,10 +35,10 @@ <% end %> <% if !_.isEmpty(@data.issues): %> - + <% if !_.isUndefined(@job_restart_count): %>

- <%- @T('Detected %s dead job(s) available for restart', @job_restart_count) %> + <%- @T('Detected %s failed job(s) available for restart', @job_restart_count) %> <%- ', restarting...' if @job_restart_count > 0 %>

<% end %> diff --git a/app/controllers/monitoring_controller.rb b/app/controllers/monitoring_controller.rb index c29a0762e..eab0c7829 100644 --- a/app/controllers/monitoring_controller.rb +++ b/app/controllers/monitoring_controller.rb @@ -177,7 +177,7 @@ curl http://localhost/api/v1/monitoring/status?token=XXX render json: result, status: :created end - def restart_dead_jobs + def restart_failed_jobs access_check count = 0 diff --git a/config/routes/monitoring.rb b/config/routes/monitoring.rb index bf7205054..637330fac 100644 --- a/config/routes/monitoring.rb +++ b/config/routes/monitoring.rb @@ -1,9 +1,9 @@ Zammad::Application.routes.draw do api_path = Rails.configuration.api_path - match api_path + '/monitoring/health_check', to: 'monitoring#health_check', via: :get - match api_path + '/monitoring/status', to: 'monitoring#status', via: :get - match api_path + '/monitoring/token', to: 'monitoring#token', via: :post - match api_path + '/monitoring/restart_dead_jobs', to: 'monitoring#restart_dead_jobs', via: :post + match api_path + '/monitoring/health_check', to: 'monitoring#health_check', via: :get + match api_path + '/monitoring/status', to: 'monitoring#status', via: :get + match api_path + '/monitoring/token', to: 'monitoring#token', via: :post + match api_path + '/monitoring/restart_failed_jobs', to: 'monitoring#restart_failed_jobs', via: :post end