tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Select is_reachable from host and service status

Browse Source 
refs #6875
This commit is contained in:
Eric Lippmann 2015-03-13 00:25:08 +01:00
parent 020329d201
commit a4731ebbb3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
View File

@ -121,6 +121,7 @@ class StatusQuery extends IdoQuery
'host_retry_check_interval' => 'hs.retry_check_interval', 'host_retry_check_interval' => 'hs.retry_check_interval',
'host_check_timeperiod_object_id' => 'hs.check_timeperiod_object_id', 'host_check_timeperiod_object_id' => 'hs.check_timeperiod_object_id',
'host_status_update_time' => 'hs.status_update_time', 'host_status_update_time' => 'hs.status_update_time',
'host_is_reachable' => 'hs.is_reachable',
'host_severity' => 'CASE WHEN hs.current_state = 0 'host_severity' => 'CASE WHEN hs.current_state = 0
THEN THEN
CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
@ -259,6 +260,7 @@ class StatusQuery extends IdoQuery
'service_check_timeperiod_object_id' => 'ss.check_timeperiod_object_id', 'service_check_timeperiod_object_id' => 'ss.check_timeperiod_object_id',
'service_status_update_time' => 'ss.status_update_time', 'service_status_update_time' => 'ss.status_update_time',
'service_problem' => 'CASE WHEN ss.current_state = 0 THEN 0 ELSE 1 END', 'service_problem' => 'CASE WHEN ss.current_state = 0 THEN 0 ELSE 1 END',
'service_is_reachable' => 'ss.is_reachable',
'service_severity' => 'CASE WHEN ss.current_state = 0 'service_severity' => 'CASE WHEN ss.current_state = 0
THEN THEN
CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL
@ -345,6 +347,10 @@ class StatusQuery extends IdoQuery
$this->columnMap['hoststatus']['host_check_source'] = '(NULL)'; $this->columnMap['hoststatus']['host_check_source'] = '(NULL)';
$this->columnMap['servicestatus']['service_check_source'] = '(NULL)'; $this->columnMap['servicestatus']['service_check_source'] = '(NULL)';
} }
if (version_compare($this->getIdoVersion(), '1.13.0', '<')) {
$this->columnMap['hoststatus']['host_is_reachable'] = '(NULL)';
$this->columnMap['servicestatus']['service_is_reachable'] = '(NULL)';
}
$this->select->from(array('ho' => $this->prefix . 'objects'), array()) $this->select->from(array('ho' => $this->prefix . 'objects'), array())
->join( ->join(
array('hs' => $this->prefix . 'hoststatus'), array('hs' => $this->prefix . 'hoststatus'),