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

HostnotificationQuery: PostgreSQL grouping... 

refs #9009
This commit is contained in:
Johannes Meyer 2015-06-18 10:58:59 +02:00
parent 068c0b6ed2
commit 8ec494c962
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,6 @@ class HostnotificationQuery extends IdoQuery
protected function joinHistory() protected function joinHistory()
{ {
$this->requireVirtualTable('contactnotifications'); $this->requireVirtualTable('contactnotifications');
$this->group(array('hn.notification_id', 'ho.name1'));
} }
/** /**
@ -142,7 +141,6 @@ class HostnotificationQuery extends IdoQuery
'cno.object_id = cn.contact_object_id', 'cno.object_id = cn.contact_object_id',
array() array()
); );
$this->group(array('cn.contactnotification_id', 'ho.name1'));
} }
/** /**
@ -175,10 +173,6 @@ class HostnotificationQuery extends IdoQuery
'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3', 'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
array() array()
); );
if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
$this->group(array('hn.notification_id', 'ho.name1'));
}
} }
/** /**
@ -228,9 +222,36 @@ class HostnotificationQuery extends IdoQuery
'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2', 'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
array() array()
); );
}
if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) { /**
$this->group(array('hn.notification_id', 'ho.name1')); * {@inheritdoc}
*/
public function getGroup()
{
if (
$this->hasJoinedVirtualTable('history')
|| $this->hasJoinedVirtualTable('services')
|| $this->hasJoinedVirtualTable('hostgroups')
) {
$group = array('hn.notification_id', 'ho.object_id');
if ($this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
$group[] = 'cno.object_id';
}
} elseif ($this->hasJoinedVirtualTable('contactnotifications')) {
$group = array('hn.notification_id', 'cno.object_id', 'ho.object_id');
} }
if (! empty($group)) {
if ($this->hasJoinedVirtualTable('hosts')) {
$group[] = 'h.host_id';
}
if ($this->hasJoinedVirtualTable('acknowledgements')) {
$group[] = 'a.acknowledgement_id';
}
}
return $group;
} }
} }