From 92634a19216d4887bd27a99a0e7ee93c3883821f Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 10 Apr 2015 14:25:53 +0200 Subject: [PATCH] DowntimeQuery: Provide case-insensitive filter column `service_host' refs #8613 --- .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php | 1 + modules/monitoring/library/Monitoring/DataView/Downtime.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php index 47db6af94..a3e66cbaf 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php @@ -32,6 +32,7 @@ class DowntimeQuery extends IdoQuery 'host_name' => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END', 'service' => 'so.name2 COLLATE latin1_general_ci', 'service_description' => 'so.name2', + 'service_host' => 'so.name1 COLLATE latin1_general_ci', 'service_host_name' => 'so.name1' ), 'hosts' => array( diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php index e2eaf7aee..4eaab1860 100644 --- a/modules/monitoring/library/Monitoring/DataView/Downtime.php +++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php @@ -69,6 +69,6 @@ class Downtime extends DataView public function getFilterColumns() { - return array('author', 'host', 'service'); + return array('author', 'host', 'service', 'service_host'); } }