tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ServicestatussummaryQuery: Do not check a host's state twice 

I was sure that this is necessary and that the query involved does
not handle this by itself, which it obviously does. I cannot find
another query I might have mistakenly associated with it though...
This commit is contained in:
Johannes Meyer 2015-06-29 16:19:33 +02:00
parent a2b7b10df8
commit 9c82a24083
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
View File

@ -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 + 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_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_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 + 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_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_warning' => 'SUM(CASE WHEN state = 1 THEN 1 ELSE 0 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)'
'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)'
)
);
@ -66,8 +66,7 @@ class ServicestatussummaryQuery extends IdoQuery
array(
'handled' => 'service_handled',
'state' => 'service_state',
'state_change' => 'service_last_state_change',
'host_problem'
'state_change' => 'service_last_state_change'
)
);
$this->select->from(