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