From 92cece92ab679783dc9ef352d6d1703362cefa44 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 17 Aug 2015 14:06:26 +0200 Subject: [PATCH] DataView\Servicegroup: Adjust how to handle filter columns refs #9029 --- .../Monitoring/DataView/Servicegroup.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php index a428caded..731d93b89 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php @@ -3,8 +3,6 @@ namespace Icinga\Module\Monitoring\DataView; -/** - * Service group view */ class Servicegroup extends DataView { /** @@ -21,7 +19,7 @@ class Servicegroup extends DataView /** * {@inheritdoc} */ - public function getFilterColumns() + public function getStaticFilterColumns() { return array( 'host', 'host_alias', 'host_display_name', 'host_name', @@ -30,18 +28,4 @@ class Servicegroup extends DataView 'servicegroup' ); } - - /** - * {@inheritdoc} - */ - public function isValidFilterTarget($column) - { - if ($column[0] === '_' - && preg_match('/^_(?:host|service)_/', $column) - ) { - return true; - } else { - return parent::isValidFilterTarget($column); - } - } }