CommentQuery: Add query column `instance_name'

refs #9943

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

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}
      */

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}
      */

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