From 2b77baa19fd77099b93fb8453d4bf2bb957d4422 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 26 Sep 2019 13:47:56 +0200 Subject: [PATCH] Hostgroupsummary: Only provide valid filter columns refs #3940 --- .../Monitoring/DataView/Hostgroupsummary.php | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php index 704aa74d4..9ed2eb910 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php +++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php @@ -58,10 +58,24 @@ class Hostgroupsummary extends DataView { return array( 'instance_name', - 'host', 'host_alias', 'host_contact', 'host_contactgroup', 'host_display_name', 'host_name', + 'host_contact', 'host_contactgroup', 'host_name', 'hostgroup', - 'service', 'service_description', 'service_display_name', - 'servicegroup', 'servicegroup_alias', 'servicegroup_name' + 'service_description', + 'servicegroup_name' ); } + + public function getFilterColumns() + { + if ($this->filterColumns === null) { + $filterColumns = parent::getFilterColumns(); + $diff = array_diff($filterColumns, $this->getColumns()); + $this->filterColumns = array_merge($diff, [ + 'Hostgroup Name' => 'hostgroup_name', + 'Hostgroup Alias' => 'hostgroup_alias' + ]); + } + + return $this->filterColumns; + } }