From b07e4b409f1b27b92bfa87380e9457181f8631ab Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 17 Jan 2018 12:41:10 +0100 Subject: [PATCH] EventHistory: Drop obsolete SUM aggregates Not used anywhere and not working for a long time already, at least as filter columns. refs #2860 --- .../Monitoring/Backend/Ido/Query/EventhistoryQuery.php | 5 ----- .../monitoring/library/Monitoring/DataView/Eventhistory.php | 5 ----- 2 files changed, 10 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php index e9e8f7d96..4aa57b51b 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php @@ -29,11 +29,6 @@ class EventhistoryQuery extends IdoQuery protected $columnMap = array( 'eventhistory' => array( 'id' => 'eh.id', - 'cnt_notification' => "SUM(CASE eh.type WHEN 'notify' THEN 1 ELSE 0 END)", - 'cnt_hard_state' => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)", - 'cnt_soft_state' => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)", - 'cnt_downtime_start' => "SUM(CASE eh.type WHEN 'dt_start' THEN 1 ELSE 0 END)", - 'cnt_downtime_end' => "SUM(CASE eh.type WHEN 'dt_end' THEN 1 ELSE 0 END)", 'host_name' => 'eh.host_name', 'service_description' => 'eh.service_description', 'object_type' => 'eh.object_type', diff --git a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php index dacc5ff90..cd947f500 100644 --- a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php +++ b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php @@ -13,11 +13,6 @@ class EventHistory extends DataView return array( 'id', 'instance_name', - 'cnt_notification', - 'cnt_hard_state', - 'cnt_soft_state', - 'cnt_downtime_start', - 'cnt_downtime_end', 'host_name', 'host_display_name', 'service_description',