ServicedowntimeQuery: PostgreSQL grouping...

refs #9009
Icinga · Jun 18, 2015 · 068c0b6 · 068c0b6
1 parent 72de85a
commit 068c0b6
Showing 1 changed file with 29 additions and 2 deletions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -99,7 +99,6 @@ protected function joinHostgroups()
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -146,7 +145,6 @@ protected function joinServicegroups()
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -172,4 +170,33 @@ protected function joinServicestatus()
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('sd.scheduleddowntime_id', 'so.object_id');
+
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('hoststatus')) {
+                $group[] = 'hs.hoststatus_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('services')) {
+                $group[] = 's.service_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('servicestatus')) {
+                $group[] = 'ss.servicestatus_id';
+            }
+        }
+
+        return $group;
+    }
 }