From 6bf588dd0c4e1c6afee6c26b53536c16d93ecf55 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 10 Jul 2020 16:43:39 +0200 Subject: [PATCH] Fixes #3077: Empty "issues" attribute of Monitoring / HealthCheck result causes errors in Zabbix. --- app/controllers/monitoring_controller.rb | 1 + spec/requests/integration/monitoring_spec.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/monitoring_controller.rb b/app/controllers/monitoring_controller.rb index 9dae0b050..afae5000d 100644 --- a/app/controllers/monitoring_controller.rb +++ b/app/controllers/monitoring_controller.rb @@ -168,6 +168,7 @@ curl http://localhost/api/v1/monitoring/health_check?token=XXX result = { healthy: true, message: 'success', + issues: issues, token: token, } render json: result diff --git a/spec/requests/integration/monitoring_spec.rb b/spec/requests/integration/monitoring_spec.rb index 7be530add..be6703c21 100644 --- a/spec/requests/integration/monitoring_spec.rb +++ b/spec/requests/integration/monitoring_spec.rb @@ -128,6 +128,7 @@ RSpec.describe 'Monitoring', type: :request do expect(json_response).to be_a_kind_of(Hash) expect(json_response['error']).to be_falsey + expect(json_response['issues']).to eq([]) expect(json_response['healthy']).to eq(true) expect(json_response['message']).to eq('success')