From 91fe6913d8742c95e210daf716b8054f4d82f8e2 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:31:39 +0200 Subject: [PATCH 01/14] CommentQuery: Add query column `instance_name' refs #9943 --- .../Monitoring/Backend/Ido/Query/CommentQuery.php | 3 ++- .../Backend/Ido/Query/HostcommentQuery.php | 15 +++++++++++++++ .../Backend/Ido/Query/ServicecommentQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Comment.php | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php index d80f74d36..e826f16a6 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php @@ -25,7 +25,8 @@ class CommentQuery extends IdoQuery 'comment_is_persistent' => 'c.comment_is_persistent', 'comment_timestamp' => 'c.comment_timestamp', 'comment_type' => 'c.comment_type', - 'object_type' => 'c.object_type' + 'object_type' => 'c.object_type', + 'instance_name' => 'c.instance_name' ), 'hosts' => array( 'host_display_name' => 'c.host_display_name', diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php index 6fae0c658..54c675087 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php @@ -17,6 +17,9 @@ class HostcommentQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'comments' => array( 'comment_author' => 'c.author_name COLLATE latin1_general_ci', 'comment_author_name' => 'c.author_name', @@ -151,6 +154,18 @@ class HostcommentQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = c.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php index d4eca1aa8..8b2b9e04f 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php @@ -17,6 +17,9 @@ class ServicecommentQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'comments' => array( 'comment_author' => 'c.author_name COLLATE latin1_general_ci', 'comment_author_name' => 'c.author_name', @@ -165,6 +168,18 @@ class ServicecommentQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = c.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php index 528d2aef3..5a34079f9 100644 --- a/modules/monitoring/library/Monitoring/DataView/Comment.php +++ b/modules/monitoring/library/Monitoring/DataView/Comment.php @@ -14,6 +14,7 @@ class Comment extends DataView public function getColumns() { return array( + 'instance_name', 'comment_author_name', 'comment_data', 'comment_expiration', From ab628338c2ecfc6a9ab3dc40be0f8659322565c4 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:32:15 +0200 Subject: [PATCH 02/14] ContactgroupQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/ContactgroupQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Contactgroup.php | 1 + 2 files changed, 16 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php index 83934d811..fe552894c 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php @@ -17,6 +17,9 @@ class ContactgroupQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'contactgroups' => array( 'contactgroup' => 'cgo.name1 COLLATE latin1_general_ci', 'contactgroup_name' => 'cgo.name1', @@ -187,6 +190,18 @@ class ContactgroupQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = cg.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php index fa1c9b863..994879c59 100644 --- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php +++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php @@ -11,6 +11,7 @@ class Contactgroup extends DataView public function getColumns() { return array( + 'instance_name', 'contactgroup_name', 'contactgroup_alias', 'contact_object_id', From 7916c149b95b1eb886510798c25bdea5a77922eb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:32:27 +0200 Subject: [PATCH 03/14] ContactQuery: Add query column `instance_name' refs #9943 --- .../Monitoring/Backend/Ido/Query/ContactQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Contact.php | 1 + 2 files changed, 16 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php index cd72c4782..bd156e176 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php @@ -17,6 +17,9 @@ class ContactQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'contacts' => array( 'contact_id' => 'c.contact_id', 'contact' => 'co.name1 COLLATE latin1_general_ci', @@ -183,6 +186,18 @@ class ContactQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = c.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php index af8128f0e..5add208cd 100644 --- a/modules/monitoring/library/Monitoring/DataView/Contact.php +++ b/modules/monitoring/library/Monitoring/DataView/Contact.php @@ -11,6 +11,7 @@ class Contact extends DataView public function getColumns() { return array( + 'instance_name', 'contact_object_id', 'contact_id', 'contact_name', From edb83c8b41371a24b967edd66beec2e9a48571bb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:33:41 +0200 Subject: [PATCH 04/14] CustomvarQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/CustomvarQuery.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php index e4b87abfa..b24409aae 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php @@ -6,6 +6,9 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query; class CustomvarQuery extends IdoQuery { protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'customvariablestatus' => array( 'varname' => 'cvs.varname', 'varvalue' => 'cvs.varvalue', @@ -55,6 +58,18 @@ class CustomvarQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = cvs.instance_id', + array() + ); + } + /** * {@inheritdoc} */ From f70a861ff40496234cef958a2eccb9e40bf0382a Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:34:18 +0200 Subject: [PATCH 05/14] DowntimeQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/DowntimeQuery.php | 3 ++- .../Backend/Ido/Query/HostdowntimeQuery.php | 15 +++++++++++++++ .../Backend/Ido/Query/ServicedowntimeQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Downtime.php | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php index 1127a537c..420559ba8 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php @@ -30,7 +30,8 @@ class DowntimeQuery extends IdoQuery 'downtime_scheduled_end' => 'd.downtime_scheduled_end', 'downtime_scheduled_start' => 'd.downtime_scheduled_start', 'downtime_start' => 'd.downtime_start', - 'object_type' => 'd.object_type' + 'object_type' => 'd.object_type', + 'instance_name' => 'd.instance_name' ), 'hosts' => array( 'host_display_name' => 'd.host_display_name', diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php index 2776bcdc2..a8ff8355b 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php @@ -17,6 +17,9 @@ class HostdowntimeQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'downtimes' => array( 'downtime_author' => 'sd.author_name COLLATE latin1_general_ci', 'downtime_author_name' => 'sd.author_name', @@ -157,6 +160,18 @@ class HostdowntimeQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = sd.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php index 09162ea35..18a22ea93 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php @@ -17,6 +17,9 @@ class ServicedowntimeQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'downtimes' => array( 'downtime_author' => 'sd.author_name COLLATE latin1_general_ci', 'downtime_author_name' => 'sd.author_name', @@ -171,6 +174,18 @@ class ServicedowntimeQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = sd.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php index 5787a09ff..57450c948 100644 --- a/modules/monitoring/library/Monitoring/DataView/Downtime.php +++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php @@ -14,6 +14,7 @@ class Downtime extends DataView public function getColumns() { return array( + 'instance_name', 'downtime_author_name', 'downtime_comment', 'downtime_duration', From fedd2c3b18528252bf734415d76ea25a80c1ea4f Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:34:37 +0200 Subject: [PATCH 06/14] HostgroupQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/HostgroupQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Hostgroup.php | 1 + 2 files changed, 16 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php index 5144953c2..aaa72a166 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php @@ -17,6 +17,9 @@ class HostgroupQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'hostgroups' => array( 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', @@ -126,6 +129,18 @@ class HostgroupQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = hg.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php index 66cfee189..9350276b3 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php +++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php @@ -14,6 +14,7 @@ class Hostgroup extends DataView public function getColumns() { return array( + 'instance_name', 'hostgroup_alias', 'hostgroup_name' ); From 5c2fd633474d3af331f9f9c6eb68411d58018a32 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:34:48 +0200 Subject: [PATCH 07/14] ServicegroupQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/ServicegroupQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Servicegroup.php | 1 + 2 files changed, 16 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php index 7c2aafc36..9ec523bb0 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php @@ -14,6 +14,9 @@ class ServicegroupQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'hostgroups' => array( 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', @@ -118,6 +121,18 @@ class ServicegroupQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = sg.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php index 731d93b89..f2d7e1eac 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php @@ -11,6 +11,7 @@ class Servicegroup extends DataView public function getColumns() { return array( + 'instance_name', 'servicegroup_alias', 'servicegroup_name' ); From 780ac16be1fa7e10f2ba95d7291ec46e234b60f7 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:35:16 +0200 Subject: [PATCH 08/14] NotificationQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/HostnotificationQuery.php | 15 +++++++++++++++ .../Backend/Ido/Query/NotificationQuery.php | 3 ++- .../Ido/Query/ServicenotificationQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Notification.php | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php index f2bbe5f47..b06e5440b 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php @@ -17,6 +17,9 @@ class HostnotificationQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'notifications' => array( 'notification_output' => 'hn.output', 'notification_start_time' => 'UNIX_TIMESTAMP(hn.start_time)', @@ -224,6 +227,18 @@ class HostnotificationQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = hn.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php index e9085de90..a459a4187 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php @@ -26,7 +26,8 @@ class NotificationQuery extends IdoQuery 'acknowledgement_entry_time' => 'n.acknowledgement_entry_time', 'acknowledgement_author_name' => 'n.acknowledgement_author_name', 'acknowledgement_comment_data' => 'n.acknowledgement_comment_data', - 'object_type' => 'n.object_type' + 'object_type' => 'n.object_type', + 'instance_name' => 'n.instance_name' ), 'history' => array( 'type' => 'n.type', diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php index c5f68db85..30e4dc7e2 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php @@ -17,6 +17,9 @@ class ServicenotificationQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'notifications' => array( 'notification_output' => 'sn.output', 'notification_start_time' => 'UNIX_TIMESTAMP(sn.start_time)', @@ -222,6 +225,18 @@ class ServicenotificationQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = sn.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php index aa8afd0b1..98babe4e7 100644 --- a/modules/monitoring/library/Monitoring/DataView/Notification.php +++ b/modules/monitoring/library/Monitoring/DataView/Notification.php @@ -11,6 +11,7 @@ class Notification extends DataView public function getColumns() { return array( + 'instance_name', 'notification_state', 'notification_start_time', 'notification_contact_name', From ced671a4080b9a1b334e7c89611af22f1b0e3d61 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:35:35 +0200 Subject: [PATCH 09/14] HoststatusQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/HoststatusQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Hoststatus.php | 1 + 2 files changed, 16 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php index 968d5607e..1d15243db 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php @@ -16,6 +16,9 @@ class HoststatusQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'hostgroups' => array( 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', @@ -237,6 +240,18 @@ class HoststatusQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = ho.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php index 8d7efb35d..05385763c 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php @@ -11,6 +11,7 @@ class HostStatus extends DataView public function getColumns() { return array( + 'instance_name', 'host_name', 'host_display_name', 'host_alias', From 344dcf2cf792080c373a8cbd74626286eb718ca3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:35:48 +0200 Subject: [PATCH 10/14] ServicestatusQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/ServicestatusQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Servicestatus.php | 1 + 2 files changed, 16 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php index ce988e944..c5fc6e755 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php @@ -19,6 +19,9 @@ class ServicestatusQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'hostgroups' => array( 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', @@ -280,6 +283,18 @@ class ServicestatusQuery extends IdoQuery $this->joinedVirtualTables['services'] = true; } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = so.instance_id', + array() + ); + } + /** * Join host groups */ diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php index c60152049..ff68474f1 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php @@ -11,6 +11,7 @@ class ServiceStatus extends DataView public function getColumns() { return array( + 'instance_name', 'host_name', 'host_display_name', 'host_state', From 6906ea89b7c67be191603c74fde6f79973652adc Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:37:58 +0200 Subject: [PATCH 11/14] *historyQuery: Add query column `instance_name' refs #9943 --- .../Backend/Ido/Query/HostcommenthistoryQuery.php | 15 +++++++++++++++ .../Ido/Query/HostdowntimestarthistoryQuery.php | 15 +++++++++++++++ .../Backend/Ido/Query/HoststatehistoryQuery.php | 15 +++++++++++++++ .../Ido/Query/ServicecommenthistoryQuery.php | 15 +++++++++++++++ .../Query/ServicedowntimestarthistoryQuery.php | 15 +++++++++++++++ .../Ido/Query/ServicestatehistoryQuery.php | 15 +++++++++++++++ .../library/Monitoring/DataView/Eventgrid.php | 1 + .../library/Monitoring/DataView/Eventhistory.php | 1 + 8 files changed, 92 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php index 1931b6638..c3ac3b860 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php @@ -17,6 +17,9 @@ class HostcommenthistoryQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'commenthistory' => array( 'host' => 'ho.name1 COLLATE latin1_general_ci', 'host_name' => 'ho.name1', @@ -149,6 +152,18 @@ class HostcommenthistoryQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = hch.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php index 118f7e526..9813259b0 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php @@ -17,6 +17,9 @@ class HostdowntimestarthistoryQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'downtimehistory' => array( 'host' => 'ho.name1 COLLATE latin1_general_ci', 'host_name' => 'ho.name1', @@ -158,6 +161,18 @@ class HostdowntimestarthistoryQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = hdh.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php index 8cb3b0964..8dd740104 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php @@ -27,6 +27,9 @@ class HoststatehistoryQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'statehistory' => array( 'host' => 'ho.name1 COLLATE latin1_general_ci', 'host_name' => 'ho.name1', @@ -165,6 +168,18 @@ class HoststatehistoryQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = hh.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php index baa3d4d5a..2c0290a67 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php @@ -17,6 +17,9 @@ class ServicecommenthistoryQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'commenthistory' => array( 'host' => 'so.name1 COLLATE latin1_general_ci', 'host_name' => 'so.name1', @@ -147,6 +150,18 @@ class ServicecommenthistoryQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = sch.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php index deaa4ae9b..4ab58f6cd 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php @@ -17,6 +17,9 @@ class ServicedowntimestarthistoryQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'downtimehistory' => array( 'host' => 'so.name1 COLLATE latin1_general_ci', 'host_name' => 'so.name1', @@ -156,6 +159,18 @@ class ServicedowntimestarthistoryQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = sdh.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php index 4c8ce7082..40e8a3fab 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php @@ -27,6 +27,9 @@ class ServicestatehistoryQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'statehistory' => array( 'host' => 'so.name1 COLLATE latin1_general_ci', 'host_name' => 'so.name1', @@ -163,6 +166,18 @@ class ServicestatehistoryQuery extends IdoQuery ); } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = sh.instance_id', + array() + ); + } + /** * {@inheritdoc} */ diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php index 70d1c7ff5..4a8c398c1 100644 --- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php +++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php @@ -50,6 +50,7 @@ class Eventgrid extends DataView public function getStaticFilterColumns() { return array( + 'instance_name', 'host', 'host_alias', 'hostgroup', 'hostgroup_alias', 'hostgroup_name', 'service', 'service_host_name', diff --git a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php index df4c22604..29579ff33 100644 --- a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php +++ b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php @@ -11,6 +11,7 @@ class EventHistory extends DataView public function getColumns() { return array( + 'instance_name', 'cnt_notification', 'cnt_hard_state', 'cnt_soft_state', From 94693fe3e72b73bfe9d972a486a2d1d0b2ec3ade Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:38:23 +0200 Subject: [PATCH 12/14] DataView\*summary: Add query column `instance_name' refs #9943 --- .../monitoring/library/Monitoring/DataView/Hostgroupsummary.php | 1 + .../monitoring/library/Monitoring/DataView/Hoststatussummary.php | 1 + .../library/Monitoring/DataView/Servicegroupsummary.php | 1 + .../library/Monitoring/DataView/Servicestatussummary.php | 1 + modules/monitoring/library/Monitoring/DataView/Statussummary.php | 1 + 5 files changed, 5 insertions(+) diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php index 9fb2ecb7a..3c11521d1 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php +++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php @@ -47,6 +47,7 @@ class Hostgroupsummary extends DataView public function getStaticFilterColumns() { return array( + 'instance_name', 'hosts_severity', 'host', 'host_alias', 'host_display_name', 'host_name', 'hostgroup', diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php b/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php index 2ae3fd1c2..af8adf233 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php +++ b/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php @@ -30,6 +30,7 @@ class Hoststatussummary extends DataView public function getStaticFilterColumns() { return array( + 'instance_name', 'host', 'host_alias', 'host_display_name', 'host_name', 'hostgroup', 'hostgroup_alias', 'hostgroup_name', 'service', 'service_description', 'service_display_name', diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php index a16124652..417926da6 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php @@ -42,6 +42,7 @@ class Servicegroupsummary extends DataView public function getStaticFilterColumns() { return array( + 'instance_name', 'services_severity', 'host', 'host_alias', 'host_display_name', 'host_name', 'hostgroup', 'hostgroup_alias', 'hostgroup_name', diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php b/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php index c79edf2d7..feb27b310 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php @@ -35,6 +35,7 @@ class Servicestatussummary extends DataView public function getStaticFilterColumns() { return array( + 'instance_name', 'host', 'host_alias', 'host_display_name', 'host_name', 'hostgroup', 'hostgroup_alias', 'hostgroup_name', 'service', 'service_description', 'service_display_name', diff --git a/modules/monitoring/library/Monitoring/DataView/Statussummary.php b/modules/monitoring/library/Monitoring/DataView/Statussummary.php index ae3afd25d..70ef73254 100644 --- a/modules/monitoring/library/Monitoring/DataView/Statussummary.php +++ b/modules/monitoring/library/Monitoring/DataView/Statussummary.php @@ -101,6 +101,7 @@ class StatusSummary extends DataView public function getStaticFilterColumns() { return array( + 'instance_name', 'host', 'host_alias', 'host_display_name', 'host_name', 'hostgroup', 'hostgroup_alias', 'hostgroup_name', 'service', 'service_description', 'service_display_name', From 819d20f17a812c418fbc6492178a5e663de4d878 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:38:54 +0200 Subject: [PATCH 13/14] Hostservice...Query: Add query column `instance_name' refs #9943 --- .../Ido/Query/HostserviceproblemsummaryQuery.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php index b2fca387c..8ae6f98c8 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php @@ -21,6 +21,9 @@ class HostserviceproblemsummaryQuery extends IdoQuery * {@inheritdoc} */ protected $columnMap = array( + 'instances' => array( + 'instance_name' => 'i.instance_name' + ), 'services' => array( 'host_name' => 'so.name1', 'service_description' => 'so.name2' @@ -76,6 +79,18 @@ class HostserviceproblemsummaryQuery extends IdoQuery $this->joinedVirtualTables['services'] = true; } + /** + * Join instances + */ + protected function joinInstances() + { + $this->select->join( + array('i' => $this->prefix . 'instances'), + 'i.instance_id = so.instance_id', + array() + ); + } + /** * Join host groups */ From 91315738c8bbb8526d82cc95ceb6e58394e176af Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 25 Aug 2015 16:39:40 +0200 Subject: [PATCH 14/14] monitoring: Allow `instance_name' as restriction column refs #9934 --- modules/monitoring/library/Monitoring/Controller.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php index 9d9e486cd..fd3ac7740 100644 --- a/modules/monitoring/library/Monitoring/Controller.php +++ b/modules/monitoring/library/Monitoring/Controller.php @@ -62,6 +62,7 @@ class Controller extends IcingaWebController { $restrictions = Filter::matchAny(); $restrictions->setAllowedFilterColumns(array( + 'instance_name', 'host_name', 'hostgroup_name', 'service_description', @@ -85,6 +86,7 @@ class Controller extends IcingaWebController $restriction, $filter, implode(', ', array( + 'instance_name', 'host_name', 'hostgroup_name', 'service_description',