Files
bsdports/net/icingaweb2/files/patch-x-modules-monitoring-library-Monitoring-Backend-Ido-Query-ServiceflappingstarthistoryQuery.php
2019-12-26 07:26:06 +00:00

49 lines
2.5 KiB
PHP

--- ./modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingstarthistoryQuery.php.orig 2019-08-14 13:10:19.000000000 +0200
+++ ./modules/monitoring/library/Monitoring/Backend/Ido/Query/ServiceflappingstarthistoryQuery.php 2019-10-14 15:53:03.885350000 +0200
@@ -34,12 +34,12 @@
protected $columnMap = array(
'flappinghistory' => array(
'id' => 'sfh.flappinghistory_id',
- 'host' => 'so.name1 COLLATE latin1_general_ci',
+ 'host' => 'so.name1 COLLATE utf8_unicode_ci',
'host_name' => 'so.name1',
'object_id' => 'sfh.object_id',
'object_type' => '(\'service\')',
'output' => '(sfh.percent_state_change || \'\')',
- 'service' => 'so.name2 COLLATE latin1_general_ci',
+ 'service' => 'so.name2 COLLATE utf8_unicode_ci',
'service_description' => 'so.name2',
'service_host_name' => 'so.name1',
'state' => '(-1)',
@@ -47,24 +47,24 @@
'type' => "('flapping')"
),
'hostgroups' => array(
- 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
- 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
+ 'hostgroup' => 'hgo.name1 COLLATE utf8_unicode_ci',
+ 'hostgroup_alias' => 'hg.alias COLLATE utf8_unicode_ci',
'hostgroup_name' => 'hgo.name1'
),
'hosts' => array(
'host_alias' => 'h.alias',
- 'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+ 'host_display_name' => 'h.display_name COLLATE utf8_unicode_ci'
),
'instances' => array(
'instance_name' => 'i.instance_name'
),
'servicegroups' => array(
'servicegroup_name' => 'sgo.name1',
- 'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
- 'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
+ 'servicegroup' => 'sgo.name1 COLLATE utf8_unicode_ci',
+ 'servicegroup_alias' => 'sg.alias COLLATE utf8_unicode_ci'
),
'services' => array(
- 'service_display_name' => 's.display_name COLLATE latin1_general_ci'
+ 'service_display_name' => 's.display_name COLLATE utf8_unicode_ci'
)
);