From a630869bcf528468ced70db9c8d3b2095e67fe3a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 4 Sep 2015 15:17:28 +0200
Subject: [PATCH] Provide stats for unhandled problems and improve layout

refs #10033
---
 .../controllers/HealthController.php          | 10 ++-
 .../views/scripts/health/stats.phtml          | 64 +++++++++++++++++--
 public/css/icinga/widgets.less                |  5 ++
 3 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/controllers/HealthController.php b/modules/monitoring/application/controllers/HealthController.php
index c6f239d0c..bbfdcb030 100644
--- a/modules/monitoring/application/controllers/HealthController.php
+++ b/modules/monitoring/application/controllers/HealthController.php
@@ -129,6 +129,9 @@ class HealthController extends Controller
         ));
         $this->applyRestriction('monitoring/filter/objects', $servicestats);
         $this->view->servicestats = $servicestats->fetchRow();
+        $this->view->unhandledServiceProblems = $this->view->servicestats->services_critical_unhandled
+            + $this->view->servicestats->services_unknown_unhandled
+            + $this->view->servicestats->services_warning_unhandled;
 
         $hoststats = $this->backend->select()->from('hoststatussummary', array(
             'hosts_total',
@@ -142,7 +145,12 @@ class HealthController extends Controller
             'hosts_pending',
         ));
         $this->applyRestriction('monitoring/filter/objects', $hoststats);
-        $this->view->hoststats = $hoststats;
+        $this->view->hoststats = $hoststats->fetchRow();
+        $this->view->unhandledhostProblems = $this->view->hoststats->hosts_down_unhandled
+            + $this->view->hoststats->hosts_unreachable_unhandled;
+
+        $this->view->unhandledProblems = $this->view->unhandledhostProblems
+            + $this->view->unhandledServiceProblems;
 
         $this->view->runtimevariables  = (object) $this->backend->select()
             ->from('runtimevariables', array('varname', 'varvalue'))
diff --git a/modules/monitoring/application/views/scripts/health/stats.phtml b/modules/monitoring/application/views/scripts/health/stats.phtml
index 30828cec7..275fbf4f8 100644
--- a/modules/monitoring/application/views/scripts/health/stats.phtml
+++ b/modules/monitoring/application/views/scripts/health/stats.phtml
@@ -9,16 +9,56 @@ if (! $this->compact): ?>
 <?php endif ?>
 
 <div class="content processinfo">
-
     <div class="boxview">
-
         <div class="box left">
+            <h3><?= $this->unhandledProblems ?> <?= $this->translate('Unhandled Problems:') ?>
+                <span class="badge badge-critical"> <?= $this->unhandledProblems ?> </span>
+            </h3>
+            <table class="avp">
+                <tbody>
+                <tr>
+                    <th> <?= $this->translate('Service Problems:') ?> </th>
+                    <td>
+                        <span class="badge badge-critical">
+                            <?=
+                            $this->qlink(
+                                $this->unhandledServiceProblems,
+                                'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity'
+                            )
+                            ?>
+                        </span>
+                    </td>
+                </tr>
+                <tr>
+                    <th> <?= $this->translate('Host Problems:') ?> </th>
+                    <td>
+                        <span class="badge badge-critical">
+                            <?=
+                            $this->qlink(
+                                $this->unhandledhostProblems,
+                                'monitoring/list/hosts?host_problem=1&host_handled=0'
+                            )
+                            ?>
+                        </span>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+            <br>
+
             <h3 class="tinystatesummary" data-base-target="_next">
                 <?php $this->stats = $hoststats ?>
                 <?= $this->render('list/components/hostssummary.phtml') ?>
             </h3>
-
             <table class="avp">
+                <thead>
+                <tr>
+                    <th><strong><?= $this->translate('Runtime Variables') ?></strong></th>
+                    <th><?= $this->translate('Host Checks') ?></th>
+                    <th></th>
+                    <th></th>
+                </tr>
+                </thead>
                 <tbody>
                 <tr>
                     <th> <?= $this->translate('Total') ?> </th>
@@ -30,17 +70,17 @@ if (! $this->compact): ?>
                 </tr>
                 </tbody>
             </table>
+            <br>
 
             <h3 class="tinystatesummary" data-base-target="_next">
                 <?php $this->stats = $servicestats ?>
                 <?= $this->render('list/components/servicesummary.phtml') ?>
             </h3>
-
             <table class="avp">
                 <thead>
                 <tr>
-                    <th></th>
-                    <th><?= $this->translate('Amount') ?></th>
+                    <th><strong> <?= $this->translate('Runtime Variables') ?> </strong></th>
+                    <th><?= $this->translate('Service Checks') ?></th>
                     <th><?= $this->translate('Per Host') ?></th>
                     <th></th>
                 </tr>
@@ -60,12 +100,13 @@ if (! $this->compact): ?>
                     </tr>
                 </tbody>
             </table>
+            <br>
 
             <h3><?= $this->translate('Active checks') ?></h3>
             <table class="avp">
                 <thead>
                 <tr>
-                    <th></th>
+                    <th><strong> <?= $this->translate('Check Performance') ?> </strong></th>
                     <th><?= $this->translate('Checks') ?></th>
                     <th><?= $this->translate('Latency') ?></th>
                     <th><?= $this->translate('Execution time') ?></th>
@@ -86,9 +127,18 @@ if (! $this->compact): ?>
                 </tr>
                 </tbody>
             </table>
+            <br>
 
             <h3><?= $this->translate('Passive checks') ?></h3>
             <table class="avp">
+                <thead>
+                <tr>
+                    <th><strong> <?= $this->translate('Check Performance') ?> </strong></th>
+                    <th><?= $this->translate('Passive Checks') ?></th>
+                    <th></th>
+                    <th></th>
+                </tr>
+                </thead>
                 <tbody>
                 <tr>
                     <th><?= $this->translate('Host Checks') ?></th>
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 95b64429a..9f884e746 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -234,6 +234,11 @@ li li .badge-container {
   background-color: @colorInvalid;
 }
 
+.badge a[href] {
+    color: white;
+    text-decoration: none;
+}
+
 #menu nav ul .badge {
   margin-right: 0em;
   top: 0.3em;