tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Fix host and service groups overviews when using PostgreSQL

Browse Source 
fixes #8268
This commit is contained in:
Eric Lippmann 2015-01-23 15:40:33 +01:00
parent a07bff490f
commit a1fbb3d937
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
View File

@ -57,17 +57,14 @@ class GroupSummaryQuery extends IdoQuery
'host_state' 'host_state'
); );
// Prepend group column since we'll use columns index 0 later for grouping
if (in_array('servicegroup', $this->desiredColumns)) { if (in_array('servicegroup', $this->desiredColumns)) {
array_unshift($columns, 'servicegroup'); $columns[] = 'servicegroup';
} else {
array_unshift($columns, 'hostgroup');
}
if (in_array('hostgroup_alias', $this->desiredColumns)) {
$columns[] = 'hostgroup_alias';
}
if (in_array('servicegroup_alias', $this->desiredColumns)) {
$columns[] = 'servicegroup_alias'; $columns[] = 'servicegroup_alias';
$groupColumns = array('servicegroup', 'servicegroup_alias');
} else {
$columns[] = 'hostgroup';
$columns[] = 'hostgroup_alias';
$groupColumns = array('hostgroup', 'hostgroup_alias');
} }
$hosts = $this->createSubQuery( $hosts = $this->createSubQuery(
'Hoststatus', 'Hoststatus',
@ -83,6 +80,7 @@ class GroupSummaryQuery extends IdoQuery
$hosts->group(array( $hosts->group(array(
'sgo.name1', 'sgo.name1',
'ho.object_id', 'ho.object_id',
'sg.alias',
'state', 'state',
'acknowledged', 'acknowledged',
'in_downtime', 'in_downtime',
@ -101,7 +99,7 @@ class GroupSummaryQuery extends IdoQuery
) )
); );
$union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL); $union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
$this->select->from(array('statussummary' => $union), array())->group(array($columns[0])); $this->select->from(array('statussummary' => $union), array())->group($groupColumns);
$this->joinedVirtualTables = array( $this->joinedVirtualTables = array(
'servicestatussummary' => true, 'servicestatussummary' => true,
'hoststatussummary' => true 'hoststatussummary' => true