diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostflappingstarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostflappingstarthistoryQuery.php index b9d538234..c09e4ac8a 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostflappingstarthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostflappingstarthistoryQuery.php @@ -44,6 +44,7 @@ class HostflappingstarthistoryQuery extends IdoQuery 'type' => '(\'flapping\')' ), 'hostgroups' => array( + 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', 'hostgroup_name' => 'hgo.name1' ), @@ -56,6 +57,7 @@ class HostflappingstarthistoryQuery extends IdoQuery ), 'servicegroups' => array( 'servicegroup_name' => 'sgo.name1', + 'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci', 'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci' ), 'services' => array( diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php index 2d875f061..5356c3fcc 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php @@ -26,7 +26,9 @@ class HostnotificationQuery extends IdoQuery 'notification_contact_name' => 'co.name1' ), '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( 'host_display_name' => 'h.display_name COLLATE latin1_general_ci' @@ -51,7 +53,9 @@ class HostnotificationQuery extends IdoQuery 'object_type' => '(\'host\')' ), '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( 'service' => 'so.name2 COLLATE latin1_general_ci', diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingstarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingstarthistoryQuery.php index b4fd78cb4..f6f67f709 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingstarthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingstarthistoryQuery.php @@ -47,6 +47,7 @@ class ServiceflappingstarthistoryQuery extends IdoQuery 'type' => "('flapping')" ), 'hostgroups' => array( + 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', 'hostgroup_name' => 'hgo.name1' ), @@ -59,6 +60,7 @@ class ServiceflappingstarthistoryQuery extends IdoQuery ), 'servicegroups' => array( 'servicegroup_name' => 'sgo.name1', + 'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci', 'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci' ), 'services' => array( diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php index b9d63f40e..b15587b5d 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php @@ -33,7 +33,9 @@ class ServicenotificationQuery extends IdoQuery 'type' => '(\'notify\')' ), '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( 'host_display_name' => 'h.display_name COLLATE latin1_general_ci' @@ -54,7 +56,9 @@ class ServicenotificationQuery extends IdoQuery 'service_host_name' => 'so.name1' ), '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( 'service_display_name' => 's.display_name COLLATE latin1_general_ci'