From c299fb3ce9889e1f342b3f07088a69023d908059 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 5 Jun 2015 09:14:26 +0200 Subject: [PATCH] monitoring: Support filtering the host group overview by service custom variables refs #9009 --- .../Monitoring/DataView/Hostgroupsummary.php | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php index 56ae7be35..b576c685b 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php +++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php @@ -48,8 +48,10 @@ class Hostgroupsummary extends DataView { return array( 'hosts_severity', - 'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name', - 'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name' + 'host', 'host_alias', 'host_display_name', 'host_name', + 'hostgroup', + 'service', 'service_description', + 'servicegroup', 'servicegroup_alias', 'servicegroup_name' ); } @@ -93,4 +95,18 @@ class Hostgroupsummary extends DataView ) ); } + + /** + * {@inheritdoc} + */ + public function isValidFilterTarget($column) + { + if ($column[0] === '_' + && preg_match('/^_(?:host|service)_/', $column) + ) { + return true; + } else { + return parent::isValidFilterTarget($column); + } + } }