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

Do not join hosts when fetching a service's downtimes 

refs #8614
This commit is contained in:
Eric Lippmann 2015-03-06 13:14:20 +01:00
parent db99c323cc
commit 7317aa7158
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,16 +281,18 @@ abstract class MonitoredObject implements Filterable
'is_flexible' => 'downtime_is_flexible', 'is_flexible' => 'downtime_is_flexible',
'is_fixed' => 'downtime_is_fixed', 'is_fixed' => 'downtime_is_fixed',
'is_in_effect' => 'downtime_is_in_effect', 'is_in_effect' => 'downtime_is_in_effect',
'entry_time' => 'downtime_entry_time', 'entry_time' => 'downtime_entry_time'
'host' => 'downtime_host',
'service' => 'downtime_service'
)) ))
->where('downtime_objecttype', $this->type) ->where('downtime_objecttype', $this->type)
->where('downtime_host', $this->host_name)
->order('downtime_is_in_effect', 'DESC') ->order('downtime_is_in_effect', 'DESC')
->order('downtime_scheduled_start', 'ASC'); ->order('downtime_scheduled_start', 'ASC');
if ($this->type === self::TYPE_SERVICE) { if ($this->type === self::TYPE_SERVICE) {
$downtimes->where('downtime_service', $this->service_description); $downtimes
->where('service_host_name', $this->host_name)
->where('service_description', $this->service_description);
} else {
$downtimes
->where('host_name', $this->host_name);
} }
$this->downtimes = $downtimes->getQuery()->fetchAll(); $this->downtimes = $downtimes->getQuery()->fetchAll();
return $this; return $this;