Add support for IPv6 address

refs #9645
Icinga · Aug 4, 2015 · a14f800 · a14f800
1 parent ceb3267
commit a14f800
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 13 deletions.
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
@@ -77,6 +77,7 @@ public function servicesAction()
             'host_state_type',
             'host_last_state_change',
             'host_address',
+            'host_address6',
             'host_handled',
             'service_description',
             'service_display_name',

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
@@ -52,6 +52,7 @@ protected function handleCommandForm(ObjectsCommandForm $form)
             'host_icon_image_alt',
             'host_name',
             'host_address',
+            'host_address6',
             'host_state',
             'host_problem',
             'host_handled',
@@ -91,6 +92,7 @@ public function showAction()
             'host_icon_image_alt',
             'host_name',
             'host_address',
+            'host_address6',
             'host_state',
             'host_problem',
             'host_handled',

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
@@ -75,6 +75,7 @@ public function hostsAction()
             'host_display_name',
             'host_state' => $stateColumn,
             'host_address',
+            'host_address6',
             'host_acknowledged',
             'host_output',
             'host_attempt',
@@ -151,6 +152,7 @@ public function servicesAction()
             'host_state_type',
             'host_last_state_change',
             'host_address',
+            'host_address6',
             'host_handled',
             'service_description',
             'service_display_name',

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
@@ -54,6 +54,7 @@ protected function handleCommandForm(ObjectsCommandForm $form)
             'host_icon_image_alt',
             'host_name',
             'host_address',
+            'host_address6',
             'host_output',
             'host_state',
             'host_problem',
@@ -101,6 +102,7 @@ public function showAction()
             'host_icon_image_alt',
             'host_name',
             'host_address',
+            'host_address6',
             'host_output',
             'host_state',
             'host_problem',

diff --git a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
@@ -14,11 +14,14 @@ use Icinga\Module\Monitoring\Object\Host;
           <?php if ($object->host_display_name !== $object->host_name): ?>
             <small>(<?= $this->escape($object->host_name); ?>)</small>
           <?php endif ?>
+          <?= $this->render('partials/host/statusicons.phtml'); ?>
+          <br/>
+          <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
+            <span class="address padded" title="IPv6 address"><?= $this->escape($object->host_address6); ?></span>
+          <?php endif ?>
           <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
-            <br>
-            <?= $this->escape($object->host_address); ?>
+              <span class="address padded" title="IPv4 address"><?= $this->escape($object->host_address); ?></span>
           <?php endif ?>
-            <?= $this->render('partials/host/statusicons.phtml'); ?>
         </td>
     </tr>
 </table>
diff --git a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
@@ -15,11 +15,13 @@ use Icinga\Module\Monitoring\Object\Service;
           <?php if ($object->host_display_name !== $object->host_name): ?>
             <small>(<?= $this->escape($object->host_name); ?>)</small>
           <?php endif ?>
+          <br/>
+          <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
+            <span class="address padded" title="IPv6 address"><?= $this->escape($object->host_address6); ?></span>
+          <?php endif ?>
           <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
-            <br>
-            <?= $this->escape($object->host_address); ?>
+            <span class="address padded" title="IPv4 address"><?= $this->escape($object->host_address); ?></span>
           <?php endif ?>
-            <?= $this->render('partials/host/statusicons.phtml'); ?>
         </td>
     </tr>
     <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : ''; ?>">

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -25,6 +25,7 @@ class HoststatusQuery extends IdoQuery
             'host'                  => 'ho.name1 COLLATE latin1_general_ci',
             'host_action_url'       => 'h.action_url',
             'host_address'          => 'h.address',
+            'host_address6'         => 'h.address6',
             'host_alias'            => 'h.alias',
             'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
             'host_icon_image'       => 'h.icon_image',

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -27,6 +27,7 @@ class ServicestatusQuery extends IdoQuery
         'hosts' => array(
             'host_action_url'       => 'h.action_url',
             'host_address'          => 'h.address',
+            'host_address6'         => 'h.address6',
             'host_alias'            => 'h.alias COLLATE latin1_general_ci',
             'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
             'host_icon_image'       => 'h.icon_image',

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -39,6 +39,7 @@ public function setMode($mode)
             'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
             'host_alias'            => 'h.alias',
             'host_address'          => 'h.address',
+            'host_address6'         => 'h.address6',
             'host_ipv4'             => 'INET_ATON(h.address)',
             'host_icon_image'       => 'h.icon_image',
             'host_icon_image_alt'   => 'h.icon_image_alt',

diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
@@ -15,6 +15,7 @@ public function getColumns()
             'host_display_name',
             'host_alias',
             'host_address',
+            'host_address6',
             'host_state',
             'host_state_type',
             'host_handled',

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
@@ -29,6 +29,7 @@ public function getColumns()
             'host_state_type',
             'host_last_state_change',
             'host_address',
+            'host_address6',
             'host_problem',
             'host_handled',
             'service_description',

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -96,6 +96,7 @@ protected function getDataView()
             'host_active_checks_enabled',
             'host_active_checks_enabled_changed',
             'host_address',
+            'host_address6',
             'host_alias',
             'host_check_command',
             'host_check_execution_time',

diff --git a/modules/monitoring/library/Monitoring/Object/Macro.php b/modules/monitoring/library/Monitoring/Object/Macro.php
@@ -14,11 +14,13 @@ class Macro
      * @var array
      */
     private static $icingaMacros = array(
-        'HOSTNAME'     => 'host_name',
-        'HOSTADDRESS'  => 'host_address',
-        'SERVICEDESC'  => 'service_description',
-        'host.name'    => 'host_name',
-        'host.address' => 'host_address',
+        'HOSTNAME'      => 'host_name',
+        'HOSTADDRESS'   => 'host_address',
+        'HOSTADDRESS6'  => 'host_address6',
+        'SERVICEDESC'   => 'service_description',
+        'host.name'     => 'host_name',
+        'host.address'  => 'host_address',
+        'host.address6' => 'host_address6',
         'service.description' => 'service_description'
     );
 

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -111,6 +111,7 @@ protected function getDataView()
             'host_acknowledged',
             'host_active_checks_enabled',
             'host_address',
+            'host_address6',
             'host_alias',
             'host_display_name',
             'host_handled',

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
@@ -4,12 +4,19 @@
   width: 16em;
 }
 
-p.pluginoutput {
-  width: 100%;
+.padded {
+  padding: 0 5px;
+}
+
+.address, p.pluginoutput {
   white-space: pre-wrap;
   font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'DejaVu Sans Mono', 'Courier New', Courier, monospace;
 }
 
+p.pluginoutput {
+  width: 100%;
+}
+
 table.action td .pluginoutput {
   font-size: 0.875em;
   line-height: 1.2em;

diff --git a/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
@@ -16,25 +16,31 @@ public function testHostMacros()
         $hostMock = Mockery::mock('host');
         $hostMock->host_name = 'test';
         $hostMock->host_address = '1.1.1.1';
+        $hostMock->host_address6 = '::1';
 
         $this->assertEquals(Macro::resolveMacros('$HOSTNAME$', $hostMock), $hostMock->host_name);
         $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS$', $hostMock), $hostMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS6$', $hostMock), $hostMock->host_address6);
         $this->assertEquals(Macro::resolveMacros('$host.name$', $hostMock), $hostMock->host_name);
         $this->assertEquals(Macro::resolveMacros('$host.address$', $hostMock), $hostMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$host.address6$', $hostMock), $hostMock->host_address6);
     }
 
     public function testServiceMacros()
     {
         $svcMock = Mockery::mock('service');
         $svcMock->host_name = 'test';
         $svcMock->host_address = '1.1.1.1';
+        $svcMock->host_address6 = '::1';
         $svcMock->service_description = 'a service';
 
         $this->assertEquals(Macro::resolveMacros('$HOSTNAME$', $svcMock), $svcMock->host_name);
         $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS$', $svcMock), $svcMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS6$', $svcMock), $svcMock->host_address6);
         $this->assertEquals(Macro::resolveMacros('$SERVICEDESC$', $svcMock), $svcMock->service_description);
         $this->assertEquals(Macro::resolveMacros('$host.name$', $svcMock), $svcMock->host_name);
         $this->assertEquals(Macro::resolveMacros('$host.address$', $svcMock), $svcMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$host.address6$', $svcMock), $svcMock->host_address6);
         $this->assertEquals(Macro::resolveMacros('$service.description$', $svcMock), $svcMock->service_description);
     }