From b9ea25506e7d55b0435554b2d283071896525108 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 11 Aug 2015 14:12:52 +0200 Subject: [PATCH] HoststatusQuery: Remove obsolete code to join service problems --- .../Backend/Ido/Query/HoststatusQuery.php | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php index c164a8bcf..a7b237851 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php @@ -148,9 +148,6 @@ class HoststatusQuery extends IdoQuery 'servicegroup_name' => 'sgo.name1', 'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci' ), - 'serviceproblemsummary' => array( - 'host_unhandled_services' => 'sps.unhandled_services_count' - ), 'services' => array( 'service' => 'so.name2 COLLATE latin1_general_ci', 'service_description' => 'so.name2', @@ -331,45 +328,6 @@ SQL; ); } - /** - * Join service problem summary - */ - protected function joinServiceproblemsummary() - { - $select = <<<'SQL' -SELECT - SUM( - CASE WHEN(ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 - THEN 0 - ELSE 1 - END - ) AS unhandled_services_count, - SUM( - CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0) ) > 0 - THEN 1 - ELSE 0 - END - ) AS handled_services_count, - s.host_object_id -FROM - icinga_servicestatus ss - JOIN icinga_objects o ON o.object_id = ss.service_object_id - JOIN icinga_services s ON s.service_object_id = o.object_id - JOIN icinga_hoststatus hs ON hs.host_object_id = s.host_object_id -WHERE - o.is_active = 1 - AND o.objecttype_id = 2 - AND ss.current_state > 0 -GROUP BY - s.host_object_id -SQL; - $this->select->joinLeft( - array('sps' => new Zend_Db_Expr('(' . $select . ')')), - 'sps.host_object_id = ho.object_id', - array() - ); - } - /** * {@inheritdoc} */