From 23235e4513896e610ed306c8b6ff802b33acc438 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 20 Aug 2013 23:04:24 +0200 Subject: [PATCH] Added a few columns to Ido/ContactQuery --- .../Backend/Ido/Query/ContactQuery.php | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php index e08ec6e76..c219ff5a3 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php @@ -4,17 +4,35 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query; class ContactQuery extends AbstractQuery { + // TODO: join host/service timeperiod + protected $columnMap = array( 'contacts' => array( 'contact_name' => 'co.name1 COLLATE latin1_general_ci', 'contact_alias' => 'c.alias', 'contact_email' => 'c.email_address', 'contact_pager' => 'c.pager_address', + 'contact_has_host_notfications' => 'c.host_notifications_enabled', + 'contact_has_service_notfications' => 'c.service_notifications_enabled', + 'contact_can_submit_commands' => 'c.can_submit_commands', + 'contact_notify_service_recovery' => 'c.notify_service_recovery', + 'contact_notify_service_warning' => 'c.notify_service_warning', + 'contact_notify_service_critical' => 'c.notify_service_critical', + 'contact_notify_service_unknown' => 'c.notify_service_unknown', + 'contact_notify_service_flapping' => 'c.notify_service_flapping', + 'contact_notify_service_downtime' => 'c.notify_service_recovery', + 'contact_notify_host_recovery' => 'c.notify_host_recovery', + 'contact_notify_host_down' => 'c.notify_host_down', + 'contact_notify_host_unreachable' => 'c.notify_host_unreachable', + 'contact_notify_host_flapping' => 'c.notify_host_flapping', + 'contact_notify_host_downtime' => 'c.notify_host_downtime', ), 'hosts' => array( - 'host_name' => 'ho.name1 COLLATE latin1_general_ci', + 'host_object_id' => 'ho.object_id', + 'host_name' => 'ho.name1 COLLATE latin1_general_ci', ), 'services' => array( + 'service_object_id' => 'so.object_id', 'service_host_name' => 'so.name1 COLLATE latin1_general_ci', 'service_description' => 'so.name2 COLLATE latin1_general_ci', )