From ea16d45aa3d357ec1afb29f3c2e322afab73f7a0 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 10 Apr 2015 16:01:09 +0200 Subject: [PATCH] EventgridQuery: Make filter column `hostgroup' case-insensitive ...and add a case-sensitive query column. refs #8613 --- .../library/Monitoring/Backend/Ido/Query/EventgridQuery.php | 3 ++- modules/monitoring/library/Monitoring/DataView/Eventgrid.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php index b3eeb53358..766dced215 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php @@ -35,7 +35,8 @@ class EventgridQuery extends IdoQuery ), 'hostgroups' => array( - 'hostgroup' => 'hgo.name1' + 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', + 'hostgroup_name' => 'hgo.name1' ) ); diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php index 88ff94908b..c7ea5b9ac4 100644 --- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php +++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php @@ -47,6 +47,6 @@ public function getSortRules() public function getFilterColumns() { - return array('host', 'service'); + return array('host', 'service', 'hostgroup'); } }