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

monitoring: Don't apply restrictions in the downtime query

Browse Source 
Restrictions should be applied from the controller.

refs #9009
This commit is contained in:
Eric Lippmann 2015-05-29 11:41:39 +02:00
parent 7793b61e4c
commit 4544653c2e
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,41 +71,6 @@ class DowntimeQuery extends IdoQuery
return $this; return $this;
} }
/**
* Apply host restrictions to a query
*
* @param IdoQuery $query
*/
protected function applyHostRestrictions(IdoQuery $query)
{
$hostRestrictions = Filter::matchAny();
foreach (Manager::getInstance()->getRestrictions('monitoring/hosts/filter') as $restriction) {
$hostRestrictions->addFilter(Filter::fromQueryString($restriction));
}
$query->addFilter($hostRestrictions);
}
/**
* Apply host and service restrictions to a query
*
* @param IdoQuery $query
*/
protected function applyServiceRestrictions(IdoQuery $query)
{
$hostAndServiceRestrictions = Filter::matchAll();
$hostRestrictions = Filter::matchAny();
$serviceRestrictions = Filter::matchAny();
foreach (Manager::getInstance()->getRestrictions('monitoring/hosts/filter') as $restriction) {
$hostRestrictions->addFilter(Filter::fromQueryString($restriction));
}
foreach (Manager::getInstance()->getRestrictions('monitoring/services/filter') as $restriction) {
$serviceRestrictions->addFilter(Filter::fromQueryString($restriction));
}
$hostAndServiceRestrictions->addFilter($hostRestrictions);
$hostAndServiceRestrictions->addFilter($serviceRestrictions);
$query->addFilter($hostAndServiceRestrictions);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@ -129,7 +94,6 @@ class DowntimeQuery extends IdoQuery
$columns[$column] = new Zend_Db_Expr('NULL'); $columns[$column] = new Zend_Db_Expr('NULL');
} }
$hosts = $this->createSubQuery('hoststatus', $columns); $hosts = $this->createSubQuery('hoststatus', $columns);
$this->applyHostRestrictions($hosts);
$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);
} }
@ -141,7 +105,6 @@ class DowntimeQuery extends IdoQuery
{ {
$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('servicestatus', $columns);
$this->applyServiceRestrictions($services);
$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);
} }