Merge branch 'feature/alert-summary-4074'

resolves #4074 resolves #4473
Icinga · Oct 8, 2014 · db804f9 · db804f9
2 parents f77a0e9 + 6622042
commit db804f9
Show file tree

Hide file tree

Showing 9 changed files with 772 additions and 2 deletions.
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
@@ -32,6 +32,10 @@ public function init()
     {
         $this->createTabs();
         $this->view->compact = $this->_request->getParam('view') === 'compact';
+        if ($this->_request->getParam('view') === 'inline') {
+            $this->view->compact = true;
+            $this->view->inline = true;
+        }
         $this->url = Url::fromRequest();
     }
 

diff --git a/modules/monitoring/application/views/helpers/MonitoringState.php b/modules/monitoring/application/views/helpers/MonitoringState.php
@@ -22,6 +22,15 @@ public function monitoringState($object, $type = 'service')
         }
     }
 
+    public function monitoringStateById($id, $type = 'service')
+    {
+        if ($type === 'service') {
+            return $this->servicestates[$id];
+        } elseif ($type === 'host') {
+            return $this->hoststates[$id];
+        }
+    }
+
     /**
      * @deprecated Monitoring colors are clustered.
      */

diff --git a/modules/monitoring/application/views/scripts/alertsummary/defectimage.phtml b/modules/monitoring/application/views/scripts/alertsummary/defectimage.phtml
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -0,0 +1,82 @@
+<?php
+$helper = $this->getHelper('MonitoringState');
+?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <div style="margin: 1em;" class="dontprint">
+        <?= $intervalBox; ?>
+    </div>
+    <?= $this->widget('limiter') ?>
+    <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
+</div>
+
+<div class="content alertsummary">
+    <h1><?= $this->translate('Alert summary'); ?></h1>
+
+    <div class="alertsummary-flex-container">
+        <div class="alertsummary-flex">
+            <h2><?= $this->translate('Notifications and problems'); ?></h2>
+            <div>
+                <?= $defectChart->render(); ?>
+            </div>
+        </div>
+
+        <div class="alertsummary-flex">
+            <h2><?= $this->translate('Time to reaction (Ack, Recover)'); ?></h2>
+            <div>
+                <?= $healingChart->render(); ?>
+            </div>
+        </div>
+    </div>
+
+    <h2><?= $this->translate('Trend'); ?></h2>
+
+    <div class="alertsummary-flex-container">
+        <div class="alertsummary-flex">
+            <?= $this->translate('Average') ?>
+            <strong><?= $this->perf->avg; ?></strong>
+            <?= $this->translate('notifications per hour'); ?>,
+            <strong><?= $this->perf->last; ?></strong>
+            <?= $this->translate('in the last hour'); ?>.
+
+            <?= $this->translate('Trend for the last 24h'); ?>
+            (<?= $this->trend->percent; ?>%
+            <strong><?= $this->translate($this->trend->trend); ?></strong>)
+
+            <span>
+                <?php if ($this->trend->trend === 'up'): ?>
+                    <?= $this->icon('up.png'); ?>
+                <?php elseif ($this->trend->trend === 'unchanged'): ?>
+                    <?= $this->icon('next.png'); ?>
+                <?php else: ?>
+                    <?= $this->icon('down.png'); ?>
+                <?php endif; ?>
+            </span>
+        </div>
+    </div>
+
+    <?php if ($this->recentAlerts): ?>
+        <h2><?= $this->translate('Top 5 recent alerts'); ?></h2>
+
+        <div class="alertsummary-flex-container">
+            <div class="alertsummary-flex">
+                <?= $this->partial('list/notifications.phtml', array(
+                    'notifications' => $this->recentAlerts,
+                    'compact'       => true,
+                    'inline'        => true
+                )); ?>
+            </div>
+        </div>
+    <?php endif; ?>
+
+    <h2><?= $this->translate('History'); ?></h2>
+    <div class="alertsummary-flex-container">
+        <div class="alertsummary-flex">
+            <?= $this->partial('list/notifications.phtml', array(
+                'notifications' => $this->notifications,
+                'compact'       => true,
+                'inline'        => true
+            )); ?>
+        </div>
+    </div>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -1,4 +1,3 @@
-
 <?php if (!$this->compact): ?>
 <div class="controls">
   <?= $this->tabs ?>
@@ -10,7 +9,10 @@
  </div>
 <?php endif ?>
 
+<?php if (! $this->inline): ?>
 <div class="content">
+<?php endif; ?>
+
 <?php
 
 if (empty($this->notifications)) {
@@ -75,4 +77,6 @@ foreach ($notifications as $notification):
 </tbody>
 </table>
 
+<?php if (!$this->inline): ?>
 </div>
+<?php endif; ?>
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
@@ -122,6 +122,18 @@
 ));
 $section->add($this->translate('Timeline'))->setUrl('monitoring/timeline');
 
+/*
+ * Reporting Section
+ */
+$section = $this->menuSection($this->translate('Reporting'), array(
+    'icon'      => 'img/icons/hostgroup.png',
+    'priority'  => 100
+));
+
+$section->add($this->translate('Alert Summary'), array(
+   'url'    => 'monitoring/alertsummary/index'
+));
+
 /*
  * System Section
  */

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -18,7 +18,8 @@ class NotificationQuery extends IdoQuery
         'notification' => array(
             'notification_output'       => 'n.output',
             'notification_start_time'   => 'UNIX_TIMESTAMP(n.start_time)',
-            'notification_state'        => 'n.state'
+            'notification_state'        => 'n.state',
+            'notification_object_id'    => 'n.object_id'
         ),
         'objects' => array(
             'host'                      => 'o.name1',
@@ -30,6 +31,11 @@ class NotificationQuery extends IdoQuery
         ),
         'command' => array(
             'notification_command'      => 'cmd_o.name1'
+        ),
+        'acknowledgement' => array(
+            'acknowledgement_entry_time'    => 'UNIX_TIMESTAMP(a.entry_time)',
+            'acknowledgement_author_name'   => 'a.author_name',
+            'acknowledgement_comment_data'  => 'a.comment_data'
         )
     );
 
@@ -95,4 +101,13 @@ protected function joinCommand()
             array()
         );
     }
+
+    protected function joinAcknowledgement()
+    {
+        $this->select->joinLeft(
+            array('a' => $this->prefix . 'acknowledgements'),
+            'n.object_id = a.object_id',
+            array()
+        );
+    }
 }
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
@@ -134,3 +134,27 @@ span.state.pending {
 form.instance-features span.description, form.object-features span.description {
   display: inline;
 }
+
+.alertsummary-flex-container {
+  display: -ms-Flexbox;
+  -ms-box-orient: horizontal;
+
+  display: -webkit-flex;
+  display: -moz-flex;
+  display: -ms-flex;
+  display: flex;
+
+  -webkit-flex-flow: row wrap;
+  -moz-flex-flow: row wrap;
+  -ms-flex-flow: row wrap;
+  flex-flow: row wrap;
+}
+
+.alertsummary-flex {
+  flex: 1 1 auto;
+  overflow: auto;
+  border: 1px #333 solid;
+  padding: 5px;
+  margin: 0 10px 0 0;
+  border-spacing: 10px 10px;
+}