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

monitoring: Restrict host and service groups when viewing a host or service 

refs #9009
This commit is contained in:
Eric Lippmann 2015-06-05 14:47:01 +02:00
parent 5bc611f772
commit dae35b9106
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/monitoring/library/Monitoring/Object/MonitoredObject.php
View File

@ -308,12 +308,11 @@ abstract class MonitoredObject implements Filterable
*/
public function fetchHostgroups()
{
$hostGroups = $this->backend->select()->from('hostgroup', array(
'hostgroup_name',
'hostgroup_alias'
))
->where('host_name', $this->host);
$this->hostgroups = $hostGroups->getQuery()->fetchPairs();
$this->hostgroups = $this->backend->select()
->from('hostgroup', array('hostgroup_name', 'hostgroup_alias'))
->where('host_name', $this->host_name)
->applyFilter($this->filter)
->fetchPairs();
return $this;
}
@ -407,13 +406,12 @@ abstract class MonitoredObject implements Filterable
*/
public function fetchServicegroups()
{
$serviceGroups = $this->backend->select()->from('servicegroup', array(
'servicegroup_name',
'servicegroup_alias'
))
->where('service_host_name', $this->host_name)
->where('service_description', $this->service_description);
$this->servicegroups = $serviceGroups->getQuery()->fetchPairs();
$this->servicegroups = $this->backend->select()
->from('servicegroup', array('servicegroup_name', 'servicegroup_alias'))
->where('host_name', $this->host_name)
->where('service_description', $this->service_description)
->applyFilter($this->getFilter())
->fetchPairs();
return $this;
}