monitoring: Fix downtime filter columns

refs #9009 refs #9319
Icinga · May 26, 2015 · 6156554 · 6156554
1 parent cd1ee3e
commit 6156554
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -6,9 +6,20 @@
 class Downtime extends DataView
 {
     /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
      */
     public function getColumns()
     {
@@ -37,6 +48,17 @@ public function getColumns()
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array('hostgroup', 'hostgroup_alias', 'hostgroup_name', 'servicegroup', 'servicegroup_alias', 'servicegroup_name');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
     public function getSortRules()
     {
         return array(
@@ -66,9 +88,4 @@ public function getSortRules()
             )
         );
     }
-
-    public function getFilterColumns()
-    {
-        return array('author', 'host', 'service', 'service_host');
-    }
 }