diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php index cb992752a..a9d6be771 100644 --- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php @@ -5,19 +5,6 @@ namespace Icinga\Module\Monitoring\DataView; class HostStatus extends DataView { - /** - * {@inheritdoc} - */ - public function isValidFilterTarget($column) - { - if ($column[0] === '_' - && preg_match('/^_host_/', $column) - ) { - return true; - } - return parent::isValidFilterTarget($column); - } - /** * {@inheritdoc} */ @@ -84,7 +71,12 @@ class HostStatus extends DataView */ public function getFilterColumns() { - return array('host', 'hostgroup', 'hostgroup_name'); + return array( + 'host', + 'hostgroup', 'hostgroup_alias', 'hostgroup_name', + 'service', 'service_description', 'service_display_name', + 'servicegroup', 'servicegroup_alias', 'servicegroup_name' + ); } /** @@ -125,4 +117,17 @@ class HostStatus extends DataView ) ); } + + /** + * {@inheritdoc} + */ + public function isValidFilterTarget($column) + { + if ($column[0] === '_' + && preg_match('/^_(?:host|service)_/', $column) + ) { + return true; + } + return parent::isValidFilterTarget($column); + } }