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

monitoring: Reorder query columns in the ContactQuery

Browse Source
This commit is contained in:
Eric Lippmann 2015-09-22 11:42:51 +02:00
parent faa9b41fb8
commit 7ed7343587
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
View File

@ -17,9 +17,6 @@ class ContactQuery extends IdoQuery
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $columnMap = array( protected $columnMap = array(
'instances' => array(
'instance_name' => 'i.instance_name'
),
'contacts' => array( 'contacts' => array(
'contact_id' => 'c.contact_id', 'contact_id' => 'c.contact_id',
'contact' => 'co.name1 COLLATE latin1_general_ci', 'contact' => 'co.name1 COLLATE latin1_general_ci',
@ -43,10 +40,6 @@ class ContactQuery extends IdoQuery
'contact_notify_host_flapping' => 'c.notify_host_flapping', 'contact_notify_host_flapping' => 'c.notify_host_flapping',
'contact_notify_host_downtime' => 'c.notify_host_downtime' 'contact_notify_host_downtime' => 'c.notify_host_downtime'
), ),
'timeperiods' => array(
'contact_notify_host_timeperiod' => 'ht.alias COLLATE latin1_general_ci',
'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci'
),
'hostgroups' => array( 'hostgroups' => array(
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
@ -58,6 +51,9 @@ class ContactQuery extends IdoQuery
'host_alias' => 'h.alias', 'host_alias' => 'h.alias',
'host_display_name' => 'h.display_name COLLATE latin1_general_ci' 'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
), ),
'instances' => array(
'instance_name' => 'i.instance_name'
),
'servicegroups' => array( 'servicegroups' => array(
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci', 'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_name' => 'sgo.name1', 'servicegroup_name' => 'sgo.name1',
@ -68,6 +64,10 @@ class ContactQuery extends IdoQuery
'service_description' => 'so.name2', 'service_description' => 'so.name2',
'service_display_name' => 's.display_name COLLATE latin1_general_ci', 'service_display_name' => 's.display_name COLLATE latin1_general_ci',
'service_host_name' => 'so.name1' 'service_host_name' => 'so.name1'
),
'timeperiods' => array(
'contact_notify_host_timeperiod' => 'ht.alias COLLATE latin1_general_ci',
'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci'
) )
); );