From 227cb2c51237ea44e5c019354580078c0041fd9e Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 26 Jul 2019 16:48:22 +0200 Subject: [PATCH] Fix grouping error when selecting the notification id --- .../Monitoring/Backend/Ido/Query/HostnotificationQuery.php | 2 +- .../Monitoring/Backend/Ido/Query/ServicenotificationQuery.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php index 21e804652..d9ce93bdb 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php @@ -34,7 +34,6 @@ class HostnotificationQuery extends IdoQuery 'host_display_name' => 'h.display_name COLLATE latin1_general_ci' ), 'history' => array( - 'id' => 'hn.notification_id', 'output' => null, 'state' => 'hn.state', 'timestamp' => 'UNIX_TIMESTAMP(hn.start_time)', @@ -54,6 +53,7 @@ class HostnotificationQuery extends IdoQuery 'instance_name' => 'i.instance_name' ), 'notifications' => array( + 'id' => 'hn.notification_id', 'host' => 'ho.name1 COLLATE latin1_general_ci', 'host_name' => 'ho.name1', 'notification_output' => 'hn.output', diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php index 3c94cac71..573854a3c 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php @@ -26,7 +26,6 @@ class ServicenotificationQuery extends IdoQuery 'notification_contact_name' => 'co.name1' ), 'history' => array( - 'id' => 'sn.notification_id', 'output' => null, 'state' => 'sn.state', 'timestamp' => 'UNIX_TIMESTAMP(sn.start_time)', @@ -54,6 +53,7 @@ class ServicenotificationQuery extends IdoQuery 'instance_name' => 'i.instance_name' ), 'notifications' => array( + 'id' => 'sn.notification_id', 'host' => 'so.name1 COLLATE latin1_general_ci', 'host_name' => 'so.name1', 'notification_output' => 'sn.output',