tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Use host and service downtime query in the downtime query

Browse Source 
refs #9009
This commit is contained in:
Eric Lippmann 2015-05-29 13:12:34 +02:00
parent b833a04110
commit 6e94755c4c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
View File

@ -93,7 +93,7 @@ class DowntimeQuery extends IdoQuery
foreach (array_keys($this->columnMap['services']) as $column) { foreach (array_keys($this->columnMap['services']) as $column) {
$columns[$column] = new Zend_Db_Expr('NULL'); $columns[$column] = new Zend_Db_Expr('NULL');
} }
$hosts = $this->createSubQuery('hoststatus', $columns); $hosts = $this->createSubQuery('hostdowntime', $columns);
$this->subQueries[] = $hosts; $this->subQueries[] = $hosts;
$this->downtimeQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL); $this->downtimeQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
} }
@ -104,7 +104,7 @@ class DowntimeQuery extends IdoQuery
protected function joinServices() protected function joinServices()
{ {
$columns = array_keys($this->columnMap['downtimes'] + $this->columnMap['hosts'] + $this->columnMap['services']); $columns = array_keys($this->columnMap['downtimes'] + $this->columnMap['hosts'] + $this->columnMap['services']);
$services = $this->createSubQuery('servicestatus', $columns); $services = $this->createSubQuery('servicedowntime', $columns);
$this->subQueries[] = $services; $this->subQueries[] = $services;
$this->downtimeQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL); $this->downtimeQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
} }