monitoring: Remove HostdowntimestarthistoryQuery::getGroup()

refs #9956
Icinga · Sep 29, 2015 · 956c86d · 956c86d
1 parent df69755
commit 956c86d
Showing 1 changed file with 16 additions and 24 deletions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -13,6 +13,16 @@ class HostdowntimestarthistoryQuery extends IdoQuery
      */
     protected $allowCustomVars = true;
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $groupBase = array('downtimehistory' => array('hdh.downtimehistory_id', 'ho.object_id'));
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $groupOrigin = array('hostgroups', 'services');
+
     /**
      * {@inheritdoc}
      */
@@ -23,14 +33,12 @@ class HostdowntimestarthistoryQuery extends IdoQuery
         'downtimehistory' => array(
             'host'          => 'ho.name1 COLLATE latin1_general_ci',
             'host_name'     => 'ho.name1',
-            'object_type'   => '(\'host\')'
-        ),
-        'history' => array(
-            'type'      => "('dt_start')",
-            'timestamp' => 'UNIX_TIMESTAMP(hdh.actual_start_time)',
-            'object_id' => 'hdh.object_id',
-            'state'     => '(-1)',
-            'output'    => "('[' || hdh.author_name || '] ' || hdh.comment_data)",
+            'object_id'     => 'hdh.object_id',
+            'object_type'   => '(\'host\')',
+            'output'        => "('[' || hdh.author_name || '] ' || hdh.comment_data)",
+            'state'         => '(-1)',
+            'timestamp'     => 'UNIX_TIMESTAMP(hdh.actual_start_time)',
+            'type'          => "('dt_start')"
         ),
         'hostgroups' => array(
             'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
@@ -172,20 +180,4 @@ protected function joinInstances()
             array()
         );
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getGroup()
-    {
-        $group = array();
-        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('services')) {
-            $group = array('hdh.downtimehistory_id', 'ho.object_id');
-            if ($this->hasJoinedVirtualTable('hosts')) {
-                $group[] = 'h.host_id';
-            }
-        }
-
-        return $group;
-    }
 }