From bb8cad2a85997e02dd9f3777a852558263f899a1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 14 Oct 2013 12:56:06 +0200
Subject: [PATCH 1/4] Add event history list view (WIP)

refs #4765
---
 .../controllers/ListController.php            | 16 ++++
 .../views/scripts/list/eventhistory.phtml     | 87 +++++++++++++++++++
 .../views/scripts/show/history.phtml          |  4 +-
 .../Backend/Ido/Query/EventHistoryQuery.php   |  4 +-
 .../library/Monitoring/DataView/DataView.php  |  2 +-
 .../Monitoring/DataView/EventHistory.php      | 48 ++++++++++
 6 files changed, 155 insertions(+), 6 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/list/eventhistory.phtml
 create mode 100644 modules/monitoring/library/Monitoring/DataView/EventHistory.php

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 141fc0054..2348c6858 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -47,6 +47,7 @@ use Icinga\Module\Monitoring\DataView\Contactgroup as ContactgroupView;
 use Icinga\Module\Monitoring\DataView\HostAndServiceStatus as HostAndServiceStatusView;
 use Icinga\Module\Monitoring\DataView\Comment as CommentView;
 use Icinga\Module\Monitoring\DataView\Groupsummary as GroupsummaryView;
+use Icinga\Module\Monitoring\DataView\EventHistory as EventHistoryView;
 
 class Monitoring_ListController extends MonitoringController
 {
@@ -366,6 +367,21 @@ class Monitoring_ListController extends MonitoringController
         ));
     }
 
+    public function eventhistoryAction()
+    {
+        $query = EventHistoryView::fromRequest(
+            $this->_request
+        )->getQuery();
+
+        $this->view->history = $query->paginate();
+
+        $this->setupSortControl(
+            array(
+            )
+        );
+        $this->handleFormatRequest($query);
+    }
+
     /**
      * Handle the 'format' and 'view' parameter
      *
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
new file mode 100644
index 000000000..713778e10
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -0,0 +1,87 @@
+<h1>History</h1>
+
+<?php if (!empty($history)): ?>
+    <div data-icinga-component="app/mainDetailGrid">
+        <?=  $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
+        <table class="table table-condensed">
+            <tbody>
+            <?php foreach ($history as $event): ?>
+                <tr>
+                    <td><?= date('d.m. H:i', $event->timestamp); ?></td>
+
+                    <td>
+                        <?php if (isset($event->service)): ?>
+                            <a href="<?= $this->href('monitoring/show/service', array(
+                                'host'    => $event->host,
+                                'service' => $event->service
+                            )); ?>">
+                                <?= $event->service ?>
+                            </a>
+                        <?php else: ?>
+                            <a href="<?= $this->href('monitoring/show/host', array(
+                                'host'    => $event->host
+                            )); ?>">
+                                <?= $event->host ?>
+                            </a>
+                        <?php endif; ?>
+                    </td>
+
+                    <td>
+                        <?php
+                        switch ($event->type) {
+                            case 'notify':
+                                $icon   = '{{NOTIFICATION_ICON}}';
+                                $title  = 'Notification';
+                                $msg    = $event->output;
+                                break;
+                            case 'comment':
+                                $icon   = '{{COMMENT_ICON}}';
+                                $title  = 'Comment';
+                                $msg    = $event->output;
+                                break;
+                            case 'ack':
+                                $icon   = '{{ACKNOWLEDGEMENT_ICON}}';
+                                $title  = 'Acknowledgement';
+                                $msg    = $event->output;
+                                break;
+                            case 'dt_comment':
+                                $icon   = '{{IN_DOWNTIME_ICON}}';
+                                $title  = 'In Downtime';
+                                $msg    = $event->output;
+                                break;
+                            case 'flapping':
+                                $icon   = '{{FLAPPING_ICON}}';
+                                $title  = 'Flapping';
+                                $msg    = $event->output;
+                                break;
+                            case 'hard_state':
+                                $icon   = '{{HARDSTATE_ICON}}';
+                                $title  = 'Hard State';
+                                $msg    = '[' . $event->attempt . '/' . $event->max_attempts . ']';
+                                break;
+                            case 'soft_state':
+                                $icon   = '{{SOFTSTATE_ICON}}';
+                                $title  = 'Soft State';
+                                $msg    = '[' . $event->attempt . '/' . $event->max_attempts . ']';
+                                break;
+                            case 'dt_start':
+                                $icon   = '{{DOWNTIME_START_ICON}}';
+                                $title  = 'Downtime Start';
+                                $msg    = $event->output;
+                                break;
+                            case 'dt_end':
+                                $icon   = '{{DOWNTIME_END_ICON}}';
+                                $title  = 'Downtime End';
+                                $msg    = $event->output;
+                                break;
+                        }
+                        ?>
+                        <a href="#" title="<?= $title ?>"><i><?= $icon ?></i></a>
+                        <?php if (!empty($msg)) { echo $msg; } ?>
+                    </td>
+                </tr>
+            <? endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+<?php endif; ?>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 457f56b89..dec5dde61 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -90,13 +90,13 @@
                     'host'    => $object->host_name,
                     'service' => $object->service_description
                 )); ?>">
-                    All events for <?= $event->service_description ?>
+                    All events for <?= $object->service_description ?>
                 </a>
             <?php else: ?>
                 <a href="<?= $this->href('monitoring/list/eventhistory', array(
                     'host'    => $object->host_name
                 )); ?>">
-                    All events for <?= $event->host_name ?>
+                    All events for <?= $object->host_name ?>
                 </a>
             <?php endif; ?>
     </div>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 335b406f7..33dcaa013 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -30,9 +30,7 @@ class EventHistoryQuery extends AbstractQuery
             'max_attempts'    => 'eh.max_attempts',
             'output'          => 'eh.output', // we do not want long_output
             //'problems'        => 'CASE WHEN eh.state = 0 OR eh.state IS NULL THEN 0 ELSE 1 END',
-            'type'  => 'eh.type',
-            'service_host_name'                => 'eho.name1 COLLATE latin1_general_ci',
-            'service_description'             => 'eho.name2 COLLATE latin1_general_ci'
+            'type'  => 'eh.type'
         ),
         'hostgroups' => array(
             'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 3ee7f285a..3d6b2a48f 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -49,7 +49,7 @@ abstract class DataView
     public static function getTableName()
     {
         $tableName = explode('\\', get_called_class());
-        $tableName = strtolower(end($tableName));
+        $tableName = end($tableName);
         return $tableName;
     }
 
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
new file mode 100644
index 000000000..f94db68da
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -0,0 +1,48 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Monitoring\DataView;
+
+class EventHistory extends DataView
+{
+    /**
+     * Retrieve columns provided by this view
+     *
+     * @return array
+     */
+    public function getColumns()
+    {
+        return array(
+            'raw_timestamp',
+            'timestamp',
+            'host',
+            'service',
+            'host_name',
+            'state',
+            'attempt',
+            'max_attempts',
+            'output',
+            'type'
+        );
+    }
+
+    public function getSortRules()
+    {
+        return array(
+            'raw_timestamp' => array(
+                'default_dir' => self::SORT_DESC
+            ),
+            'timestamp' => array(
+                'default_dir' => self::SORT_DESC
+            )
+        );
+    }
+
+    public function getFilterColumns()
+    {
+        return array(
+            'hostgroups'
+        );
+    }
+}

From 68f20e623163855c3535d9c8f855dc0c4044ea4f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 16 Oct 2013 14:55:06 +0200
Subject: [PATCH 2/4] Monitoring/History: Add menu entry

refs #4765
---
 config/modules/monitoring/menu.ini                    | 11 +++++++----
 .../application/controllers/ListController.php        |  8 ++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/config/modules/monitoring/menu.ini b/config/modules/monitoring/menu.ini
index 232a31f3e..c08d64d94 100755
--- a/config/modules/monitoring/menu.ini
+++ b/config/modules/monitoring/menu.ini
@@ -23,8 +23,11 @@ Comments        = "/monitoring/list/comments"
 Contacts        = "/monitoring/list/contacts"
 Contact Groups  = "/monitoring/list/contactgroups"
 
-Servicegroups.title	= "Servicegroups"
-Servicegroups.route	= "/monitoring/list/servicegroups"
+Servicegroups.title = "Servicegroups"
+Servicegroups.route = "/monitoring/list/servicegroups"
 
-Hostgroups.title	= "Hostgroups"
-Hostgroups.route	= "/monitoring/list/hostgroups"
+Hostgroups.title    = "Hostgroups"
+Hostgroups.route    = "/monitoring/list/hostgroups"
+
+History.title   = "History"
+History.route   = "/monitoring/list/eventhistory"   
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 2348c6858..b38478b38 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -369,17 +369,13 @@ class Monitoring_ListController extends MonitoringController
 
     public function eventhistoryAction()
     {
-        $query = EventHistoryView::fromRequest(
-            $this->_request
-        )->getQuery();
-
+        $query = EventHistoryView::fromRequest($this->_request)->getQuery();
+        $this->handleFormatRequest($query);
         $this->view->history = $query->paginate();
-
         $this->setupSortControl(
             array(
             )
         );
-        $this->handleFormatRequest($query);
     }
 
     /**

From 676f9e5f7276cf36970fcda74ffc9861889f9790 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 16 Oct 2013 15:21:31 +0200
Subject: [PATCH 3/4] Monitoring/History: Show icons and color for state
 changes

refs #4765
---
 config/modules/monitoring/menu.ini            |  2 +-
 .../views/scripts/list/eventhistory.phtml     | 48 ++++++++++++-------
 .../show/components/eventHistory.phtml        |  0
 3 files changed, 33 insertions(+), 17 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/show/components/eventHistory.phtml

diff --git a/config/modules/monitoring/menu.ini b/config/modules/monitoring/menu.ini
index c08d64d94..6367e88f9 100755
--- a/config/modules/monitoring/menu.ini
+++ b/config/modules/monitoring/menu.ini
@@ -30,4 +30,4 @@ Hostgroups.title    = "Hostgroups"
 Hostgroups.route    = "/monitoring/list/hostgroups"
 
 History.title   = "History"
-History.route   = "/monitoring/list/eventhistory"   
+History.route   = "/monitoring/list/eventhistory"
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 713778e10..883aaf22f 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -1,14 +1,16 @@
 <h1>History</h1>
-
 <?php if (!empty($history)): ?>
     <div data-icinga-component="app/mainDetailGrid">
         <?=  $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
         <table class="table table-condensed">
             <tbody>
             <?php foreach ($history as $event): ?>
+                <?php
+                    $class = null;
+                    $isService = false;
+                ?>
                 <tr>
                     <td><?= date('d.m. H:i', $event->timestamp); ?></td>
-
                     <td>
                         <?php if (isset($event->service)): ?>
                             <a href="<?= $this->href('monitoring/show/service', array(
@@ -17,6 +19,10 @@
                             )); ?>">
                                 <?= $event->service ?>
                             </a>
+                            <small>
+                                on <?= $event->host ?>
+                            </small>
+                            <?php $isService = true; ?>
                         <?php else: ?>
                             <a href="<?= $this->href('monitoring/show/host', array(
                                 'host'    => $event->host
@@ -24,60 +30,70 @@
                                 <?= $event->host ?>
                             </a>
                         <?php endif; ?>
-                    </td>
-
-                    <td>
+                        <br />
                         <?php
                         switch ($event->type) {
                             case 'notify':
-                                $icon   = '{{NOTIFICATION_ICON}}';
+                                $icon   = 'notification';
                                 $title  = 'Notification';
                                 $msg    = $event->output;
                                 break;
                             case 'comment':
-                                $icon   = '{{COMMENT_ICON}}';
+                                $icon   = 'comment';
                                 $title  = 'Comment';
                                 $msg    = $event->output;
                                 break;
                             case 'ack':
-                                $icon   = '{{ACKNOWLEDGEMENT_ICON}}';
+                                $icon   = 'acknowledgement';
                                 $title  = 'Acknowledgement';
                                 $msg    = $event->output;
                                 break;
                             case 'dt_comment':
-                                $icon   = '{{IN_DOWNTIME_ICON}}';
+                                $icon   = 'in-downtime';
                                 $title  = 'In Downtime';
                                 $msg    = $event->output;
                                 break;
                             case 'flapping':
-                                $icon   = '{{FLAPPING_ICON}}';
+                                $icon   = 'flapping';
                                 $title  = 'Flapping';
                                 $msg    = $event->output;
                                 break;
                             case 'hard_state':
                                 $icon   = '{{HARDSTATE_ICON}}';
                                 $title  = 'Hard State';
-                                $msg    = '[' . $event->attempt . '/' . $event->max_attempts . ']';
+                                $msg    = $event->output . '<br /><small>Attempt ' . $event->attempt . '/' . $event->max_attempts . ' (Hard)</small>';
+                                $class  = 'border-status-' . (
+                                    $isService ?
+                                    strtolower($this->util()->getServiceStateName($event->state)) :
+                                    strtolower($this->util()->getHostStateName($event->state))
+                                );
                                 break;
                             case 'soft_state':
                                 $icon   = '{{SOFTSTATE_ICON}}';
                                 $title  = 'Soft State';
-                                $msg    = '[' . $event->attempt . '/' . $event->max_attempts . ']';
+                                $msg    = $event->output . '<br /><small>Attempt ' . $event->attempt . '/' . $event->max_attempts . ' (Soft)</small>';
+                                $class  = 'border-status-' . (
+                                    $isService ?
+                                    strtolower($this->util()->getServiceStateName($event->state)) :
+                                    strtolower($this->util()->getHostStateName($event->state))
+                                );
                                 break;
                             case 'dt_start':
-                                $icon   = '{{DOWNTIME_START_ICON}}';
+                                $icon   = 'downtime-start';
                                 $title  = 'Downtime Start';
                                 $msg    = $event->output;
                                 break;
                             case 'dt_end':
-                                $icon   = '{{DOWNTIME_END_ICON}}';
+                                $icon   = 'downtime-end';
                                 $title  = 'Downtime End';
                                 $msg    = $event->output;
                                 break;
                         }
                         ?>
-                        <a href="#" title="<?= $title ?>"><i><?= $icon ?></i></a>
-                        <?php if (!empty($msg)) { echo $msg; } ?>
+                        <div<?php if (!empty($class)): ?> class="<?= $class ?>"<?php endif; ?>>
+                            <i title="<?= $title ?>" class="icinga-icon-<?= $icon ?>"></i>
+                            <?php if (!empty($msg)) { echo $msg; } ?>
+                        </div>
                     </td>
                 </tr>
             <? endforeach; ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/eventHistory.phtml b/modules/monitoring/application/views/scripts/show/components/eventHistory.phtml
deleted file mode 100644
index e69de29bb..000000000

From 74624601f73efc2af5aadeeee06b91557bfcdc66 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 17 Oct 2013 16:17:52 +0200
Subject: [PATCH 4/4] Monitoring/History: Fix grouping w/ PostgreSQL

refs #4765
---
 .../views/scripts/list/eventhistory.phtml     |  1 +
 .../Ido/Query/NotificationhistoryQuery.php    | 49 ++++++-------------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 883aaf22f..086cb1b90 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -99,5 +99,6 @@
             <? endforeach; ?>
             </tbody>
         </table>
+        <?=  $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
     </div>
 <?php endif; ?>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index d6f72e952..5a3aeb1b1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -21,46 +21,29 @@ class NotificationhistoryQuery extends AbstractQuery
 
     protected function joinBaseTables()
     {
-//"('[' || cndetails.contacts || '] ' || n.output)"
-        // This is one of the db-specific workarounds that could be abstracted
-        // in a better way:
         switch ($this->ds->getDbType()) {
             case 'mysql':
-                $concat_contacts = "GROUP_CONCAT(c.alias ORDER BY c.alias SEPARATOR ', ')";
+                $concattedContacts = "GROUP_CONCAT(c.alias ORDER BY c.alias SEPARATOR ', ')";
                 break;
             case 'pgsql':
-                // TODO: Find a way to "ORDER" these:
-                $concat_contacts = "ARRAY_TO_STRING(ARRAY_AGG(c.alias), ', ')";
+                // TODO: Find a way to order the contact alias list:
+                $concattedContacts = "ARRAY_TO_STRING(ARRAY_AGG(c.alias), ', ')";
                 break;
             case 'oracle':
-                // TODO: This is only valid for Oracle >= 11g Release 2.
-                $concat_contacts = "LISTAGG(c.alias, ', ') WITHIN GROUP (ORDER BY c.alias)";
+                // TODO: This is only valid for Oracle >= 11g Release 2
+                $concattedContacts = "LISTAGG(c.alias, ', ') WITHIN GROUP (ORDER BY c.alias)";
                 // Alternatives:
                 //
                 //   RTRIM(XMLAGG(XMLELEMENT(e, column_name, ',').EXTRACT('//text()')),
                 //
                 //   not supported and not documented but works since 10.1,
-                //   however it is NOT always present;
+                //   however it is NOT always present:
                 //   WM_CONCAT(c.alias)
                 break;
-            default:
-                die('Not yet'); // TODO: Proper Exception
         }
-$this->columnMap['history']['output'] = "('[' || $concat_contacts || '] ' || n.output)";
-/*
-        $cndetails = $this->db->select()->from(
-            array('cn' => $this->prefix . 'contactnotifications'),
-            array(
-                'notification_id' => 'notification_id',
-                'cnt'      => 'COUNT(*)',
-                'contacts' => $concat_contacts
-            )
-        )->join(
-            array('c' => $this->prefix . 'contacts'),
-            'cn.contact_object_id = c.contact_object_id',
-            array()
-        )->group('notification_id');
-*/
+
+        $this->columnMap['history']['output'] = "('[' || $concattedContacts || '] ' || n.output)";
+
         $this->baseQuery = $this->db->select()->from(
             array('n' => $this->prefix . 'notifications'),
             array()
@@ -72,14 +55,14 @@ $this->columnMap['history']['output'] = "('[' || $concat_contacts || '] ' || n.o
             array('c' => $this->prefix . 'contacts'),
             'cn.contact_object_id = c.contact_object_id',
             array()
-        )->group('cn.notification_id')
+        )->group('cn.notification_id');
 
-        /*->join(
-            array('cndetails' => $cndetails),
-            'cndetails.notification_id = n.notification_id',
-            array()
-        )*/
-        ;
+        if ($this->ds->getDbType() === 'pgsql') {
+            $this->baseQuery->group('n.object_id')
+                ->group('n.start_time')
+                ->group('n.output')
+                ->group('n.state');
+        }
 
         $this->joinedVirtualTables = array('history' => true);
     }