From a1fbb3d93702b3980b1c527941447326518cbcdb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 15:40:33 +0100
Subject: [PATCH] monitoring: Fix host and service groups overviews when using
 PostgreSQL

fixes #8268
---
 .../Backend/Ido/Query/GroupsummaryQuery.php    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 14320567f..53c1d7ed7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -57,17 +57,14 @@ class GroupSummaryQuery extends IdoQuery
             'host_state'
         );
 
-        // Prepend group column since we'll use columns index 0 later for grouping
         if (in_array('servicegroup', $this->desiredColumns)) {
-            array_unshift($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';
             $columns[] = 'servicegroup_alias';
+            $groupColumns = array('servicegroup', 'servicegroup_alias');
+        } else {
+            $columns[] = 'hostgroup';
+            $columns[] = 'hostgroup_alias';
+            $groupColumns = array('hostgroup', 'hostgroup_alias');
         }
         $hosts = $this->createSubQuery(
             'Hoststatus',
@@ -83,6 +80,7 @@ class GroupSummaryQuery extends IdoQuery
             $hosts->group(array(
                 'sgo.name1',
                 'ho.object_id',
+                'sg.alias',
                 'state',
                 'acknowledged',
                 'in_downtime',
@@ -101,7 +99,7 @@ class GroupSummaryQuery extends IdoQuery
             )
         );
         $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(
             'servicestatussummary'  => true,
             'hoststatussummary'     => true