tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix grouping error when selecting the notification id

Browse Source
This commit is contained in:
Eric Lippmann 2019-07-26 16:48:22 +02:00
parent 98388c4346
commit 227cb2c512
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
View File

@ -34,7 +34,6 @@ class HostnotificationQuery extends IdoQuery
'host_display_name' => 'h.display_name COLLATE latin1_general_ci' 'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
), ),
'history' => array( 'history' => array(
'id' => 'hn.notification_id',
'output' => null, 'output' => null,
'state' => 'hn.state', 'state' => 'hn.state',
'timestamp' => 'UNIX_TIMESTAMP(hn.start_time)', 'timestamp' => 'UNIX_TIMESTAMP(hn.start_time)',
@ -54,6 +53,7 @@ class HostnotificationQuery extends IdoQuery
'instance_name' => 'i.instance_name' 'instance_name' => 'i.instance_name'
), ),
'notifications' => array( 'notifications' => array(
'id' => 'hn.notification_id',
'host' => 'ho.name1 COLLATE latin1_general_ci', 'host' => 'ho.name1 COLLATE latin1_general_ci',
'host_name' => 'ho.name1', 'host_name' => 'ho.name1',
'notification_output' => 'hn.output', 'notification_output' => 'hn.output',

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
View File

@ -26,7 +26,6 @@ class ServicenotificationQuery extends IdoQuery
'notification_contact_name' => 'co.name1' 'notification_contact_name' => 'co.name1'
), ),
'history' => array( 'history' => array(
'id' => 'sn.notification_id',
'output' => null, 'output' => null,
'state' => 'sn.state', 'state' => 'sn.state',
'timestamp' => 'UNIX_TIMESTAMP(sn.start_time)', 'timestamp' => 'UNIX_TIMESTAMP(sn.start_time)',
@ -54,6 +53,7 @@ class ServicenotificationQuery extends IdoQuery
'instance_name' => 'i.instance_name' 'instance_name' => 'i.instance_name'
), ),
'notifications' => array( 'notifications' => array(
'id' => 'sn.notification_id',
'host' => 'so.name1 COLLATE latin1_general_ci', 'host' => 'so.name1 COLLATE latin1_general_ci',
'host_name' => 'so.name1', 'host_name' => 'so.name1',
'notification_output' => 'sn.output', 'notification_output' => 'sn.output',