tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitoring: Make host group and service group alias columns case insensitive 

The alias columns should be case insenstive because we now support them when searching.

refs #8241
This commit is contained in:
Eric Lippmann 2015-05-21 13:58:54 +02:00
parent 0c72686ba1
commit 57328aa6ed
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,8 @@ class GroupSummaryQuery extends IdoQuery
*/
protected $columnMap = array(
'hoststatussummary' => array(
'hostgroup' => 'hostgroup',
'hostgroup_alias' => 'hostgroup_alias',
'hostgroup' => 'hostgroup COLLATE latin1_general_ci',
'hostgroup_alias' => 'hostgroup_alias COLLATE latin1_general_ci',
'hostgroup_name' => 'hostgroup_name',
'hosts_up' => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
'hosts_unreachable' => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
@ -36,8 +36,8 @@ class GroupSummaryQuery extends IdoQuery
'hosts_up_last_state_change' => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)'
),
'servicestatussummary' => array(
'servicegroup' => 'servicegroup',
'servicegroup_alias' => 'servicegroup_alias',
'servicegroup' => 'servicegroup COLLATE latin1_general_ci',
'servicegroup_alias' => 'servicegroup_alias COLLATE latin1_general_ci',
'servicegroup_name' => 'servicegroup_name',
'services_critical' => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
'services_critical_handled' => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',

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

@ -85,7 +85,7 @@ class HoststatusQuery extends IdoQuery
'hostgroups' => array(
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1',
'hostgroup_alias' => 'hg.alias'
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci'
),
'servicegroups' => array(
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',

4
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
View File

@ -162,12 +162,12 @@ class StatusQuery extends IdoQuery
'hostgroups' => array(
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1',
'hostgroup_alias' => 'hg.alias'
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci'
),
'servicegroups' => array(
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_name' => 'sgo.name1',
'servicegroup_alias' => 'sg.alias'
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
),
'services' => array(
'service_host' => 'so.name1 COLLATE latin1_general_ci',