From af2cee094229e83d5fc69d669101d28a7809cdd3 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 20 May 2016 14:41:02 +0200 Subject: [PATCH] Make host and service severities independend of whether the state is soft or hard refs #11729 --- .../Monitoring/Backend/Ido/Query/HoststatusQuery.php | 5 ----- .../Backend/Ido/Query/ServicestatusQuery.php | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php index ea466bf37..dd73dd3e5 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php @@ -148,11 +148,6 @@ class HoststatusQuery extends IdoQuery ELSE 4 END END - END - + - CASE WHEN hs.state_type = 1 - THEN 8 - ELSE 0 END', 'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END', 'host_state_type' => 'hs.state_type', diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php index 99c37613d..3aadb1047 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php @@ -131,11 +131,6 @@ class ServicestatusQuery extends IdoQuery ELSE 4 END END - END - + - CASE WHEN hs.state_type = 1 - THEN 8 - ELSE 0 END', 'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END', 'host_state_type' => 'hs.state_type', @@ -271,11 +266,6 @@ class ServicestatusQuery extends IdoQuery END END END - END - + - CASE WHEN ss.state_type = 1 - THEN 8 - ELSE 0 END', 'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END', 'service_state_type' => 'ss.state_type',