From 6e94755c4c2494099383a61e3bf6d269c77f2996 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 29 May 2015 13:12:34 +0200 Subject: [PATCH] monitoring: Use host and service downtime query in the downtime query refs #9009 --- .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php index 67be1929b..3ff4a9a24 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php @@ -93,7 +93,7 @@ class DowntimeQuery extends IdoQuery foreach (array_keys($this->columnMap['services']) as $column) { $columns[$column] = new Zend_Db_Expr('NULL'); } - $hosts = $this->createSubQuery('hoststatus', $columns); + $hosts = $this->createSubQuery('hostdowntime', $columns); $this->subQueries[] = $hosts; $this->downtimeQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL); } @@ -104,7 +104,7 @@ class DowntimeQuery extends IdoQuery protected function joinServices() { $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->downtimeQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL); }