diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php index 325203717..3215ca086 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php @@ -17,25 +17,25 @@ class ServicestatussummaryQuery extends IdoQuery protected $columnMap = array( 'servicestatussummary' => array( 'services_critical' => 'SUM(CASE WHEN state = 2 THEN 1 ELSE 0 END)', - 'services_critical_handled' => 'SUM(CASE WHEN state = 2 AND handled = 1 THEN 1 ELSE 0 END)', -// 'services_critical_handled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', - 'services_critical_unhandled' => 'SUM(CASE WHEN state = 2 AND handled = 0 THEN 1 ELSE 0 END)', -// 'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', + 'services_critical_handled' => 'SUM(CASE WHEN state = 2 AND handled + host_problem > 0 THEN 1 ELSE 0 END)', +// 'services_critical_handled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', + 'services_critical_unhandled' => 'SUM(CASE WHEN state = 2 AND handled + host_problem = 0 THEN 1 ELSE 0 END)', +// 'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', 'services_ok' => 'SUM(CASE WHEN state = 0 THEN 1 ELSE 0 END)', // 'services_ok_last_state_change' => 'MAX(CASE WHEN state = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', 'services_pending' => 'SUM(CASE WHEN state = 99 THEN 1 ELSE 0 END)', // 'services_pending_last_state_change' => 'MAX(CASE WHEN state = 99 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', 'services_total' => 'SUM(1)', 'services_unknown' => 'SUM(CASE WHEN state = 3 THEN 1 ELSE 0 END)', - 'services_unknown_handled' => 'SUM(CASE WHEN state = 3 AND handled = 1 THEN 1 ELSE 0 END)', -// 'services_unknown_handled_last_state_change' => 'MAX(CASE WHEN state = 3 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', - 'services_unknown_unhandled' => 'SUM(CASE WHEN state = 3 AND handled = 0 THEN 1 ELSE 0 END)', -// 'services_unknown_unhandled_last_state_change' => 'MAX(CASE WHEN state = 3 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', + 'services_unknown_handled' => 'SUM(CASE WHEN state = 3 AND handled + host_problem > 0 THEN 1 ELSE 0 END)', +// 'services_unknown_handled_last_state_change' => 'MAX(CASE WHEN state = 3 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', + 'services_unknown_unhandled' => 'SUM(CASE WHEN state = 3 AND handled + host_problem = 0 THEN 1 ELSE 0 END)', +// 'services_unknown_unhandled_last_state_change' => 'MAX(CASE WHEN state = 3 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', 'services_warning' => 'SUM(CASE WHEN state = 1 THEN 1 ELSE 0 END)', - 'services_warning_handled' => 'SUM(CASE WHEN state = 1 AND handled = 1 THEN 1 ELSE 0 END)', -// 'services_warning_handled_last_state_change' => 'MAX(CASE WHEN state = 1 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', - 'services_warning_unhandled' => 'SUM(CASE WHEN state = 1 AND handled = 0 THEN 1 ELSE 0 END)', -// 'services_warning_unhandled_last_state_change' => 'MAX(CASE WHEN state = 1 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)' + 'services_warning_handled' => 'SUM(CASE WHEN state = 1 AND handled + host_problem > 0 THEN 1 ELSE 0 END)', +// 'services_warning_handled_last_state_change' => 'MAX(CASE WHEN state = 1 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)', + 'services_warning_unhandled' => 'SUM(CASE WHEN state = 1 AND handled + host_problem = 0 THEN 1 ELSE 0 END)', +// 'services_warning_unhandled_last_state_change' => 'MAX(CASE WHEN state = 1 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)' ) ); @@ -66,7 +66,8 @@ class ServicestatussummaryQuery extends IdoQuery array( 'handled' => 'service_handled', 'state' => 'service_state', - 'state_change' => 'service_last_state_change' + 'state_change' => 'service_last_state_change', + 'host_problem' ) ); $this->select->from( diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php index df30ba103..9d94e8149 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php @@ -151,8 +151,6 @@ We have to find a better solution here. 'Hoststatus', array( 'handled' => 'host_handled', - 'hostgroup_alias', - 'hostgroup_name', 'host_problem', 'host_state' => new Zend_Db_Expr('NULL'), 'is_active_checked' => 'host_active_checks_enabled', @@ -172,8 +170,6 @@ We have to find a better solution here. 'Servicestatus', array( 'handled' => 'service_handled', - 'hostgroup_alias', - 'hostgroup_name', 'host_problem', 'host_state' => 'host_hard_state', 'is_active_checked' => 'service_active_checks_enabled',