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',