Merge branch 'feature/display-an-objects-instance-name-9945'

resolves #9945

modules/monitoring/application/views/scripts/show/components/command.phtml

@@ -5,6 +5,12 @@ $command = array_shift($parts);
 
 ?>
 
+<?php if ($showInstance): ?>
+<tr class="newsection">
+    <th><?= $this->translate('Instance'); ?></th>
+    <td><?= $this->escape($object->instance_name); ?></td>
+</tr>
+<?php endif ?>
 <tr class="newsection">
     <th><?= $this->translate('Command'); ?></th>
     <td>

modules/monitoring/library/Monitoring/Backend/Ido/Query/InstanceQuery.php

@@ -0,0 +1,26 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class InstanceQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'instances' => array(
+            'instance_id'   => 'i.instance_id',
+            'instance_name' => 'i.instance_name'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select()->from(array('i' => $this->prefix . 'instances'));
+        $this->joinedVirtualTables['instances'] = true;
+    }
+}

modules/monitoring/library/Monitoring/DataView/Instance.php

@@ -0,0 +1,33 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+/**
+ * View representation for instances
+ */
+class Instance extends DataView
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'instance_id',
+            'instance_name'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSortRules()
+    {
+        return array(
+            'instance_name' => array(
+                'order' => self::SORT_ASC
+            )
+        );
+    }
+}

modules/monitoring/library/Monitoring/Object/Host.php

@@ -89,6 +89,7 @@ class Host extends MonitoredObject
     protected function getDataView()
     {
         $columns = array(
+            'instance_name',
             'host_icon_image',
             'host_icon_image_alt',
             'host_acknowledged',

modules/monitoring/library/Monitoring/Object/Service.php

@@ -106,6 +106,7 @@ class Service extends MonitoredObject
     protected function getDataView()
     {
         return $this->backend->select()->from('servicestatus', array(
+            'instance_name',
             'host_icon_image',
             'host_icon_image_alt',
             'host_acknowledged',

modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php

@@ -91,6 +91,7 @@ abstract class MonitoredObjectController extends Controller
             $delDowntimeForm->handleRequest();
             $this->view->delDowntimeForm = $delDowntimeForm;
         }
+        $this->view->showInstance = $this->backend->select()->from('instance')->count() > 1;
         $this->view->object = $this->object;
     }