From 29f05bf87813c7097643d9037a6085c6432900cb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:33:19 +0200
Subject: [PATCH] NotificationQuery: Provide case-insensitive filter column
`service'
refs #8613
---
.../library/Monitoring/Backend/Ido/Query/NotificationQuery.php | 1 +
modules/monitoring/library/Monitoring/DataView/Notification.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index b60e98a62..db267fbc9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -15,6 +15,7 @@ class NotificationQuery extends IdoQuery
'objects' => array(
'host' => 'o.name1 COLLATE latin1_general_ci',
'host_name' => 'o.name1',
+ 'service' => 'o.name2 COLLATE latin1_general_ci',
'service_description' => 'o.name2'
),
'contact' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 3da39877f..f84eaddf0 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -37,6 +37,6 @@ class Notification extends DataView
public function getFilterColumns()
{
- return array('host');
+ return array('host', 'service');
}
}