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

monitoring: Re-add missing query columns to event overview

Browse Source 
`hostgroup`, `hostgroup_alias`, `servicegroup`, `servicegroup_alias`

fixes #3848
This commit is contained in:
Johannes Meyer 2019-07-18 14:50:35 +02:00
parent 853864aee1
commit 39fbd3e27e
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ class HostflappingstarthistoryQuery extends IdoQuery
'type' => '(\'flapping\')' 'type' => '(\'flapping\')'
), ),
'hostgroups' => array( 'hostgroups' => array(
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1' 'hostgroup_name' => 'hgo.name1'
), ),
@ -56,6 +57,7 @@ class HostflappingstarthistoryQuery extends IdoQuery
), ),
'servicegroups' => array( 'servicegroups' => array(
'servicegroup_name' => 'sgo.name1', 'servicegroup_name' => 'sgo.name1',
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci' 'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
), ),
'services' => array( 'services' => array(

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

@ -26,7 +26,9 @@ class HostnotificationQuery extends IdoQuery
'notification_contact_name' => 'co.name1' 'notification_contact_name' => 'co.name1'
), ),
'hostgroups' => array( 'hostgroups' => array(
'hostgroup_name' => 'hgo.name1' 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1'
), ),
'hosts' => array( 'hosts' => array(
'host_display_name' => 'h.display_name COLLATE latin1_general_ci' 'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
@ -51,7 +53,9 @@ class HostnotificationQuery extends IdoQuery
'object_type' => '(\'host\')' 'object_type' => '(\'host\')'
), ),
'servicegroups' => array( 'servicegroups' => array(
'servicegroup_name' => 'sgo.name1' 'servicegroup_name' => 'sgo.name1',
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
), ),
'services' => array( 'services' => array(
'service' => 'so.name2 COLLATE latin1_general_ci', 'service' => 'so.name2 COLLATE latin1_general_ci',

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

@ -47,6 +47,7 @@ class ServiceflappingstarthistoryQuery extends IdoQuery
'type' => "('flapping')" 'type' => "('flapping')"
), ),
'hostgroups' => array( 'hostgroups' => array(
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1' 'hostgroup_name' => 'hgo.name1'
), ),
@ -59,6 +60,7 @@ class ServiceflappingstarthistoryQuery extends IdoQuery
), ),
'servicegroups' => array( 'servicegroups' => array(
'servicegroup_name' => 'sgo.name1', 'servicegroup_name' => 'sgo.name1',
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci' 'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
), ),
'services' => array( 'services' => array(

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

@ -33,7 +33,9 @@ class ServicenotificationQuery extends IdoQuery
'type' => '(\'notify\')' 'type' => '(\'notify\')'
), ),
'hostgroups' => array( 'hostgroups' => array(
'hostgroup_name' => 'hgo.name1' 'hostgroup_name' => 'hgo.name1',
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
), ),
'hosts' => array( 'hosts' => array(
'host_display_name' => 'h.display_name COLLATE latin1_general_ci' 'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
@ -54,7 +56,9 @@ class ServicenotificationQuery extends IdoQuery
'service_host_name' => 'so.name1' 'service_host_name' => 'so.name1'
), ),
'servicegroups' => array( 'servicegroups' => array(
'servicegroup_name' => 'sgo.name1' 'servicegroup_name' => 'sgo.name1',
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
), ),
'services' => array( 'services' => array(
'service_display_name' => 's.display_name COLLATE latin1_general_ci' 'service_display_name' => 's.display_name COLLATE latin1_general_ci'