From e8a626e8960a31d95eb8970d7144385ceacf5651 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 7 Mar 2014 16:43:22 +0100
Subject: [PATCH] Change the way how boxed status information is presented to
 the user

---
 .../controllers/ListController.php            |  10 +-
 .../controllers/TacticalController.php        |  14 +-
 .../views/scripts/list/hostgroups.phtml       | 173 ++++---
 .../views/scripts/list/servicegroups.phtml    | 483 +++++++++---------
 .../tactical/components/ok_hosts.phtml        |   6 +-
 .../servicestatesummarybyhoststate.phtml      |  60 ++-
 .../tactical/components/problem_hosts.phtml   |  42 +-
 .../views/scripts/tactical/index.phtml        |   1 +
 .../Backend/Ido/Query/StatusSummaryQuery.php  |  12 +-
 .../Monitoring/DataView/ServiceStatus.php     |   1 +
 .../Monitoring/DataView/StatusSummary.php     |  12 +-
 11 files changed, 435 insertions(+), 379 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index eba6e56cb..285ca50ee 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -390,17 +390,17 @@ class Monitoring_ListController extends MonitoringController
             array(
                 'hostgroup',
                 'hosts_up',
-                'hosts_unreachable',
+                'hosts_unreachable_handled',
                 'hosts_unreachable_unhandled',
-                'hosts_down',
+                'hosts_down_handled',
                 'hosts_down_unhandled',
                 'hosts_pending',
                 'services_ok',
-                'services_unknown',
+                'services_unknown_handled',
                 'services_unknown_unhandled',
-                'services_critical',
+                'services_critical_handled',
                 'services_critical_unhandled',
-                'services_warning',
+                'services_warning_handled',
                 'services_warning_unhandled',
                 'services_pending'
             )
diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index f7df84091..104112cf4 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -25,12 +25,10 @@ class Monitoring_TacticalController extends MonitoringController
                 'hosts_up_not_checked',
                 'hosts_pending',
                 'hosts_pending_not_checked',
-                'hosts_down',
                 'hosts_down_handled',
                 'hosts_down_unhandled',
                 'hosts_down_passive',
                 'hosts_down_not_checked',
-                'hosts_unreachable',
                 'hosts_unreachable_handled',
                 'hosts_unreachable_unhandled',
                 'hosts_unreachable_passive',
@@ -40,15 +38,15 @@ class Monitoring_TacticalController extends MonitoringController
                 'services_ok_not_checked_on_ok_hosts',
                 'services_pending_on_ok_hosts',
                 'services_pending_not_checked_on_ok_hosts',
-                'services_warning_on_ok_hosts',
+                'services_warning_handled_on_ok_hosts',
                 'services_warning_unhandled_on_ok_hosts',
                 'services_warning_passive_on_ok_hosts',
                 'services_warning_not_checked_on_ok_hosts',
-                'services_critical_on_ok_hosts',
+                'services_critical_handled_on_ok_hosts',
                 'services_critical_unhandled_on_ok_hosts',
                 'services_critical_passive_on_ok_hosts',
                 'services_critical_not_checked_on_ok_hosts',
-                'services_unknown_on_ok_hosts',
+                'services_unknown_handled_on_ok_hosts',
                 'services_unknown_unhandled_on_ok_hosts',
                 'services_unknown_passive_on_ok_hosts',
                 'services_unknown_not_checked_on_ok_hosts',
@@ -56,15 +54,15 @@ class Monitoring_TacticalController extends MonitoringController
                 'services_ok_not_checked_on_problem_hosts',
                 'services_pending_on_problem_hosts',
                 'services_pending_not_checked_on_problem_hosts',
-                'services_warning_on_problem_hosts',
+                'services_warning_handled_on_problem_hosts',
                 'services_warning_unhandled_on_problem_hosts',
                 'services_warning_passive_on_problem_hosts',
                 'services_warning_not_checked_on_problem_hosts',
-                'services_critical_on_problem_hosts',
+                'services_critical_handled_on_problem_hosts',
                 'services_critical_unhandled_on_problem_hosts',
                 'services_critical_passive_on_problem_hosts',
                 'services_critical_not_checked_on_problem_hosts',
-                'services_unknown_on_problem_hosts',
+                'services_unknown_handled_on_problem_hosts',
                 'services_unknown_unhandled_on_problem_hosts',
                 'services_unknown_passive_on_problem_hosts',
                 'services_unknown_not_checked_on_problem_hosts',
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index b6df1bd0a..55a54a281 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -14,25 +14,16 @@
                 <table>
                     <thead>
                         <tr>
-                            <th>Hosts</th>
-                            <th>Services</th>
+                            <th><?= $this->translate('Hosts'); ?></th>
+                            <th><?= $this->translate('Services'); ?></th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr>
                             <td>
-<?php if ($h->hosts_down): ?>
+<?php if ($h->hosts_down_handled || $h->hosts_down_unhandled): ?>
                                 <!-- Hosts DOWN -->
                                 <div class="box entry state_down <?= $h->hosts_down_unhandled ? '' : 'handled'; ?>">
-                                    <a href="<?= $this->href(
-                                        'monitoring/list/hosts',
-                                        array(
-                                            'host_state'    => 1,
-                                            'hostgroup'     => $h->hostgroup
-                                        )
-                                    ); ?>" title="Hosts DOWN">
-                                        <?= $h->hosts_down ?> DOWN
-                                    </a>
 <?php if ($h->hosts_down_unhandled): ?>
                                     <a href="<?= $this->href(
                                         'monitoring/list/hosts',
@@ -42,24 +33,27 @@
                                             'hostgroup'         => $h->hostgroup
                                         )
                                     ); ?>" title="Hosts DOWN Unhandled">
-                                        <?= $h->hosts_down_unhandled ?> Unhandled
+                                        <?= $h->hosts_down_unhandled; ?> DOWN
+                                    </a>
+<?php endif ?>
+<?php if ($h->hosts_down_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'    => 1,
+                                            'host_handled'  => 1,
+                                            'hostgroup'     => $h->hostgroup
+                                        )
+                                    ); ?>" title="Hosts DOWN Handled">
+                                        <?= $h->hosts_down_handled . ' ' . ($h->hosts_down_unhandled ? $this->translate('Acknowledged') : 'DOWN'); ?>
                                     </a>
 <?php endif ?>
                                 </div>
                                 <!-- End of Hosts DOWN -->
 <?php endif ?>
-<?php if ($h->hosts_unreachable): ?>
+<?php if ($h->hosts_unreachable_handled || $h->hosts_unreachable_unhandled): ?>
                                 <!-- Hosts UNREACHABLE -->
                                 <div class="box entry state_unreachable <?= $h->hosts_unreachable_unhandled ? '' : 'handled'; ?>">
-                                    <a href="<?= $this->href(
-                                        'monitoring/list/hosts',
-                                        array(
-                                            'host_state'    => 2,
-                                            'hostgroup'     => $h->hostgroup
-                                        )
-                                    ); ?>" title="Hosts UNREACHABLE">
-                                        <?= $h->hosts_unreachable ?> UNREACHABLE
-                                    </a>
 <?php if ($h->hosts_unreachable_unhandled): ?>
                                     <a href="<?= $this->href(
                                         'monitoring/list/hosts',
@@ -69,7 +63,19 @@
                                             'hostgroup'         => $h->hostgroup
                                         )
                                     ); ?>" title="Hosts UNREACHABLE Unhandled">
-                                        <?= $h->hosts_unreachable_unhandled ?> Unhandled
+                                        <?= $h->hosts_unreachable_unhandled; ?> UNREACHABLE
+                                    </a>
+<?php endif ?>
+<?php if ($h->hosts_unreachable_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'    => 2,
+                                            'host_handled'  => 1,
+                                            'hostgroup'     => $h->hostgroup
+                                        )
+                                    ); ?>" title="Hosts UNREACHABLE Handled">
+                                        <?= $h->hosts_unreachable_handled . ' ' . ($h->hosts_unreachable_unhandled ? $this->translate('Acknowledged') : 'UNREACHABLE'); ?>
                                     </a>
 <?php endif ?>
                                 </div>
@@ -85,7 +91,7 @@
                                             'hostgroup'     => $h->hostgroup
                                         )
                                     ); ?>" title="Hosts UP">
-                                        <?= $h->hosts_up ?> UP
+                                        <?= $h->hosts_up; ?> UP
                                     </a>
                                 </div>
                                 <!-- End of Hosts UP -->
@@ -100,91 +106,110 @@
                                             'hostgroup'     => $h->hostgroup
                                         )
                                     ); ?>" title="Hosts PENDING">
-                                        <?= $h->hosts_pending ?> PENDING
+                                        <?= $h->hosts_pending; ?> PENDING
                                     </a>
                                 </div>
                                 <!-- End of Hosts PENDING -->
 <?php endif ?>
                             </td>
                             <td>
-<?php if ($h->services_critical): ?>
+<?php if ($h->services_critical_handled || $h->services_critical_unhandled): ?>
                                 <!-- Services CRITICAL -->
                                 <div class="box entry state_critical <?= $h->services_critical_unhandled ? '' : 'handled'; ?>">
-                                    <a href="<?= $this->href(
-                                        'monitoring/list/services',
-                                        array(
-                                            'service_state' => 2,
-                                            'hostgroup'     => $h->hostgroup,
-                                            'sort'          => 'service_severity'
-                                        )
-                                    ); ?>" title="Services CRITICAL">
-                                        <?= $h->services_critical ?> CRITICAL
-                                    </a>
 <?php if ($h->services_critical_unhandled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'         => 2,
+                                            'service_acknowledged'  => 0,
+                                            'service_in_downtime'   => 0,
+                                            'host_problem'          => 0,
+                                            'hostgroup'             => $h->hostgroup,
+                                            'sort'                  => 'service_severity'
+                                        )
+                                    ); ?>" title="Services CRITICAL Unhandled">
+                                        <?= $h->services_critical_unhandled; ?> CRITICAL
+                                    </a>
+<?php endif ?>
+<?php if ($h->services_critical_handled): ?>
                                     <a href="<?= $this->href(
                                         'monitoring/list/services',
                                         array(
                                             'service_state'     => 2,
-                                            'service_unhandled' => 1,
+                                            'service_handled'   => 1,
                                             'hostgroup'         => $h->hostgroup,
                                             'sort'              => 'service_severity'
                                         )
-                                    ); ?>" title="Services CRITICAL Unhandled">
-                                        <?= $h->services_critical_unhandled ?> Unhandled
+                                    ); ?>" title="Services CRITICAL Handled">
+                                        <?= $h->services_critical_handled . ' ' . ($h->services_critical_unhandled ? $this->translate('Acknowledged') : 'CRITICAL'); ?>
                                     </a>
 <?php endif ?>
                                 </div>
                                 <!-- End of Services CRITICAL -->
 <?php endif ?>
-<?php if ($h->services_warning): ?>
+<?php if ($h->services_warning_handled || $h->services_warning_unhandled): ?>
                                 <!-- Services WARNING -->
                                 <div class="box entry state_warning <?= $h->services_warning_unhandled ? '' : 'handled'; ?>">
-                                    <a href="<?= $this->href(
-                                        'monitoring/list/services',
-                                        array(
-                                            'service_state' => 1,
-                                            'hostgroup'     => $h->hostgroup
-                                        )
-                                    ); ?>" title="Services WARNING">
-                                        <?= $h->services_warning ?> WARNING
-                                    </a>
 <?php if ($h->services_warning_unhandled): ?>
                                     <a href="<?= $this->href(
                                         'monitoring/list/services',
                                         array(
-                                            'service_state'     => 1,
-                                            'service_unhandled' => 1,
-                                            'hostgroup'         => $h->hostgroup
+                                            'service_state'         => 1,
+                                            'service_acknowledged'  => 0,
+                                            'service_in_downtime'   => 0,
+                                            'host_problem'          => 0,
+                                            'hostgroup'             => $h->hostgroup,
+                                            'sort'                  => 'service_severity'
                                         )
                                     ); ?>" title="Services WARNING Unhandled">
-                                        <?= $h->services_warning_unhandled ?> Unhandled
+                                        <?= $h->services_warning_unhandled; ?> WARNING
+                                    </a>
+<?php endif ?>
+<?php if ($h->services_warning_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'     => 1,
+                                            'service_handled'   => 1,
+                                            'hostgroup'         => $h->hostgroup,
+                                            'sort'              => 'service_severity'
+                                        )
+                                    ); ?>" title="Services WARNING Handled">
+                                        <?= $h->services_warning_handled . ' ' . ($h->services_warning_unhandled ? $this->translate('Acknowledged') : 'WARNING'); ?>
                                     </a>
 <?php endif ?>
                                 </div>
                                 <!-- End of Services WARNING -->
 <?php endif ?>
-<?php if ($h->services_unknown): ?>
+<?php if ($h->services_unknown_handled || $h->services_unknown_unhandled): ?>
                                 <!-- Services UNKNOWN -->
-                                <div class="box entry state_unknown">
-                                    <a href="<?= $this->href(
-                                        'monitoring/list/services',
-                                        array(
-                                            'service_state' => 3,
-                                            'hostgroup'     => $h->hostgroup
-                                        )
-                                    ); ?>" title="Services UNKNOWN">
-                                        <?= $h->services_unknown ?> UNKNOWN
-                                    </a>
+                                <div class="box entry state_unknown <?= $h->services_unknown_unhandled ? '' : 'handled'; ?>">
 <?php if ($h->services_unknown_unhandled): ?>
                                     <a href="<?= $this->href(
                                         'monitoring/list/services',
                                         array(
-                                            'service_state'     => 3,
-                                            'service_unhandled' => 1,
-                                            'hostgroup'         => $h->hostgroup
+                                            'service_state'         => 3,
+                                            'service_acknowledged'  => 0,
+                                            'service_in_downtime'   => 0,
+                                            'host_problem'          => 0,
+                                            'hostgroup'             => $h->hostgroup,
+                                            'sort'                  => 'service_severity'
                                         )
                                     ); ?>" title="Services UNKNOWN Unhandled">
-                                        <?= $h->services_unknown_unhandled ?> Unhandled
+                                        <?= $h->services_unknown_unhandled; ?> UNKNOWN
+                                    </a>
+<?php endif ?>
+<?php if ($h->services_unknown_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'     => 3,
+                                            'service_handled'   => 1,
+                                            'hostgroup'         => $h->hostgroup,
+                                            'sort'              => 'service_severity'
+                                        )
+                                    ); ?>" title="Services UNKNOWN Handled">
+                                        <?= $h->services_unknown_handled . ' ' . ($h->services_unknown_unhandled ? $this->translate('Acknowledged') : 'UNKNOWN'); ?>
                                     </a>
 <?php endif ?>
                                 </div>
@@ -197,10 +222,11 @@
                                         'monitoring/list/services',
                                         array(
                                             'service_state' => 0,
-                                            'hostgroup'     => $h->hostgroup
+                                            'hostgroup'     => $h->hostgroup,
+                                            'sort'          => 'service_severity'
                                         )
                                     ); ?>" title="Services OK">
-                                        <?= $h->services_ok ?> OK
+                                        <?= $h->services_ok; ?> OK
                                     </a>
                                 </div>
                                 <!-- End of Services OK -->
@@ -212,10 +238,11 @@
                                         'monitoring/list/services',
                                         array(
                                             'service_state' => 99,
-                                            'hostgroup'     => $h->hostgroup
+                                            'hostgroup'     => $h->hostgroup,
+                                            'sort'          => 'service_severity'
                                         )
                                     ); ?>" title="Services PENDING">
-                                        <?= $h->services_pending ?> PENDING
+                                        <?= $h->services_pending; ?> PENDING
                                     </a>
                                 </div>
                                 <!-- End of Services PENDING -->
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index b33a5ed5d..1cc2e2d97 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -5,238 +5,257 @@
 <?php endif ?>
 <div class="content">
     <div class="boxview" data-base-target="col2">
-        <?php foreach($servicegroups as $servicegroup): ?>
-            <?php
-            foreach(array(
-                'hosts_down',
-                'hosts_unreachable',
-                'services_critical',
-                'services_warning',
-                'services_unknown'
-                    ) as $status)
-                $servicegroup->{$status} = (string)((int)$servicegroup->{$status .   '_handled'}
-                                                  + (int)$servicegroup->{$status . '_unhandled'});
-            ?>
-            <div class="box servicegroup">
-                <a href="<?= $this->href('monitoring/list/services', array('servicegroup' => $servicegroup->servicegroup)); ?>">
-                    <h2><?= $servicegroup->servicegroup; ?></h2>
-                </a>
-                <div class="box contents">
-                    <table>
-                        <thead>
-                            <tr>
-                                <th>Hosts</th>
-                                <th>Services</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <?php if ($servicegroup->hosts_down): ?>
-                                        <!-- Hosts DOWN -->
-                                        <div class="box entry state_down <?= $servicegroup->hosts_down_unhandled ? '' : 'handled'; ?>">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/hosts',
-                                                array(
-                                                    'host_state'    => 1,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Hosts DOWN">
-                                                <?= $servicegroup->hosts_down ?> DOWN
-                                            </a>
-                                            <?php if ($servicegroup->hosts_down_unhandled): ?>
-                                                <a href="<?= $this->href(
-                                                    'monitoring/list/hosts',
-                                                    array(
-                                                        'host_state'        => 1,
-                                                        'host_unhandled'    => 1,
-                                                        'servicegroup'         => $servicegroup->servicegroup
-                                                    )
-                                                ); ?>" title="Hosts DOWN Unhandled">
-                                                    <?= $servicegroup->hosts_down_unhandled ?> Unhandled
-                                                </a>
-                                            <?php endif ?>
-                                        </div>
-                                        <!-- End of Hosts DOWN -->
-                                    <?php endif ?>
-                                    <?php if ($servicegroup->hosts_unreachable): ?>
-                                        <!-- Hosts UNREACHABLE -->
-                                        <div class="box entry state_unreachable <?= $servicegroup->hosts_unreachable_unhandled ? '' : 'handled'; ?>">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/hosts',
-                                                array(
-                                                    'host_state'    => 2,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Hosts UNREACHABLE">
-                                                <?= $servicegroup->hosts_unreachable ?> UNREACHABLE
-                                            </a>
-                                            <?php if ($servicegroup->hosts_unreachable_unhandled): ?>
-                                                <a href="<?= $this->href(
-                                                    'monitoring/list/hosts',
-                                                    array(
-                                                        'host_state'        => 2,
-                                                        'host_unhandled'    => 1,
-                                                        'servicegroup'         => $servicegroup->servicegroup
-                                                    )
-                                                ); ?>" title="Hosts UNREACHABLE Unhandled">
-                                                    <?= $servicegroup->hosts_unreachable_unhandled ?> Unhandled
-                                                </a>
-                                            <?php endif ?>
-                                        </div>
-                                        <!-- End of Hosts UNREACHABLE -->
-                                    <?php endif ?>
-                                    <?php if ($servicegroup->hosts_up): ?>
-                                        <!-- Hosts UP -->
-                                        <div class="box entry state_up">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/hosts',
-                                                array(
-                                                    'host_state'    => 0,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Hosts UP">
-                                                <?= $servicegroup->hosts_up ?> UP
-                                            </a>
-                                        </div>
-                                        <!-- End of Hosts UP -->
-                                    <?php endif ?>
-                                    <?php if ($servicegroup->hosts_pending): ?>
-                                        <!-- Hosts PENDING -->
-                                        <div class="box entry state_pending">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/hosts',
-                                                array(
-                                                    'host_state'    => 99,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Hosts PENDING">
-                                                <?= $servicegroup->hosts_pending ?> PENDING
-                                            </a>
-                                        </div>
-                                        <!-- End of Hosts PENDING -->
-                                    <?php endif ?>
-                                </td>
-                                <td>
-                                    <?php if ($servicegroup->services_critical): ?>
-                                        <!-- Services CRITICAL -->
-                                        <div class="box entry state_critical <?= $servicegroup->services_critical_unhandled ? '' : 'handled'; ?>">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/services',
-                                                array(
-                                                    'service_state' => 2,
-                                                    'servicegroup'     => $servicegroup->servicegroup,
-                                                    'sort'          => 'service_severity'
-                                                )
-                                            ); ?>" title="Services CRITICAL">
-                                                <?= $servicegroup->services_critical ?> CRITICAL
-                                            </a>
-                                            <?php if ($servicegroup->services_critical_unhandled): ?>
-                                                <a href="<?= $this->href(
-                                                    'monitoring/list/services',
-                                                    array(
-                                                        'service_state'     => 2,
-                                                        'service_unhandled' => 1,
-                                                        'servicegroup'         => $servicegroup->servicegroup,
-                                                        'sort'              => 'service_severity'
-                                                    )
-                                                ); ?>" title="Services CRITICAL Unhandled">
-                                                    <?= $servicegroup->services_critical_unhandled ?> Unhandled
-                                                </a>
-                                            <?php endif ?>
-                                        </div>
-                                        <!-- End of Services CRITICAL -->
-                                    <?php endif ?>
-                                    <?php if ($servicegroup->services_warning): ?>
-                                        <!-- Services WARNING -->
-                                        <div class="box entry state_warning <?= $servicegroup->services_warning_unhandled ? '' : 'handled'; ?>">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/services',
-                                                array(
-                                                    'service_state' => 1,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Services WARNING">
-                                                <?= $servicegroup->services_warning ?> WARNING
-                                            </a>
-                                            <?php if ($servicegroup->services_warning_unhandled): ?>
-                                                <a href="<?= $this->href(
-                                                    'monitoring/list/services',
-                                                    array(
-                                                        'service_state'     => 1,
-                                                        'service_unhandled' => 1,
-                                                        'servicegroup'         => $servicegroup->servicegroup
-                                                    )
-                                                ); ?>" title="Services WARNING Unhandled">
-                                                    <?= $servicegroup->services_warning_unhandled ?> Unhandled
-                                                </a>
-                                            <?php endif ?>
-                                        </div>
-                                        <!-- End of Services WARNING -->
-                                    <?php endif ?>
-                                    <?php if ($servicegroup->services_unknown): ?>
-                                        <!-- Services UNKNOWN -->
-                                        <div class="box entry state_unknown">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/services',
-                                                array(
-                                                    'service_state' => 3,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Services UNKNOWN">
-                                                <?= $servicegroup->services_unknown ?> UNKNOWN
-                                            </a>
-                                            <?php if ($servicegroup->services_unknown_unhandled): ?>
-                                                <a href="<?= $this->href(
-                                                    'monitoring/list/services',
-                                                    array(
-                                                        'service_state'     => 3,
-                                                        'service_unhandled' => 1,
-                                                        'servicegroup'         => $servicegroup->servicegroup
-                                                    )
-                                                ); ?>" title="Services UNKNOWN Unhandled">
-                                                    <?= $servicegroup->services_unknown_unhandled ?> Unhandled
-                                                </a>
-                                            <?php endif ?>
-                                        </div>
-                                        <!-- End of Services UNKNOWN -->
-                                    <?php endif ?>
-                                    <?php if ($servicegroup->services_ok): ?>
-                                        <!-- Services OK -->
-                                        <div class="box entry state_ok">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/services',
-                                                array(
-                                                    'service_state' => 0,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Services OK">
-                                                <?= $servicegroup->services_ok ?> OK
-                                            </a>
-                                        </div>
-                                        <!-- End of Services OK -->
-                                    <?php endif ?>
-                                    <?php if ($servicegroup->services_pending): ?>
-                                        <!-- Services PENDING -->
-                                        <div class="box entry state_pending">
-                                            <a href="<?= $this->href(
-                                                'monitoring/list/services',
-                                                array(
-                                                    'service_state' => 99,
-                                                    'servicegroup'     => $servicegroup->servicegroup
-                                                )
-                                            ); ?>" title="Services PENDING">
-                                                <?= $servicegroup->services_pending ?> PENDING
-                                            </a>
-                                        </div>
-                                        <!-- End of Services PENDING -->
-                                    <?php endif ?>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
+<?php foreach($servicegroups as $servicegroup): ?>
+        <div class="box servicegroup">
+            <a href="<?= $this->href(
+                'monitoring/list/services',
+                array('servicegroup' => $servicegroup->servicegroup)
+            ); ?>">
+                <h2><?= $servicegroup->servicegroup; ?></h2>
+            </a>
+            <div class="box contents">
+                <table>
+                    <thead>
+                        <tr>
+                            <th><?= $this->translate('Hosts'); ?></th>
+                            <th><?= $this->translate('Services'); ?></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>
+<?php if ($servicegroup->hosts_down_handled || $servicegroup->hosts_down_unhandled): ?>
+                                <!-- Hosts DOWN -->
+                                <div class="box entry state_down <?= $servicegroup->hosts_down_unhandled ? '' : 'handled'; ?>">
+<?php if ($servicegroup->hosts_down_unhandled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'        => 1,
+                                            'host_unhandled'    => 1,
+                                            'servicegroup'      => $servicegroup->servicegroup
+                                        )
+                                    ); ?>" title="Hosts DOWN Unhandled">
+                                        <?= $servicegroup->hosts_down_unhandled; ?> DOWN
+                                    </a>
+<?php endif ?>
+<?php if ($servicegroup->hosts_down_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'    => 1,
+                                            'host_handled'  => 1,
+                                            'servicegroup'  => $servicegroup->servicegroup
+                                        )
+                                    ); ?>" title="Hosts DOWN Handled">
+                                        <?= $servicegroup->hosts_down_handled . ' ' . ($servicegroup->hosts_down_unhandled ? $this->translate('Acknowledged') : 'DOWN'); ?>
+                                    </a>
+<?php endif ?>
+                                </div>
+                                <!-- End of Hosts DOWN -->
+<?php endif ?>
+<?php if ($servicegroup->hosts_unreachable_handled || $servicegroup->hosts_unreachable_unhandled): ?>
+                                <!-- Hosts UNREACHABLE -->
+                                <div class="box entry state_unreachable <?= $servicegroup->hosts_unreachable_unhandled ? '' : 'handled'; ?>">
+<?php if ($servicegroup->hosts_unreachable_unhandled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'        => 2,
+                                            'host_unhandled'    => 1,
+                                            'servicegroup'      => $servicegroup->servicegroup
+                                        )
+                                    ); ?>" title="Hosts UNREACHABLE Unhandled">
+                                        <?= $servicegroup->hosts_unreachable_unhandled; ?> UNREACHABLE
+                                    </a>
+<?php endif ?>
+<?php if ($servicegroup->hosts_unreachable_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'    => 2,
+                                            'host_handled'  => 1,
+                                            'servicegroup'  => $servicegroup->servicegroup
+                                        )
+                                    ); ?>" title="Hosts UNREACHABLE Handled">
+                                        <?= $servicegroup->hosts_unreachable_handled . ' ' . ($servicegroup->hosts_unreachable_unhandled ? $this->translate('Acknowledged') : 'UNREACHABLE'); ?>
+                                    </a>
+<?php endif ?>
+                                </div>
+                                <!-- End of Hosts UNREACHABLE -->
+<?php endif ?>
+<?php if ($servicegroup->hosts_up): ?>
+                                <!-- Hosts UP -->
+                                <div class="box entry state_up">
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'    => 0,
+                                            'servicegroup'  => $servicegroup->servicegroup
+                                        )
+                                    ); ?>" title="Hosts UP">
+                                        <?= $servicegroup->hosts_up; ?> UP
+                                    </a>
+                                </div>
+                                <!-- End of Hosts UP -->
+<?php endif ?>
+<?php if ($servicegroup->hosts_pending): ?>
+                                <!-- Hosts PENDING -->
+                                <div class="box entry state_pending">
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/hosts',
+                                        array(
+                                            'host_state'    => 99,
+                                            'servicegroup'  => $servicegroup->servicegroup
+                                        )
+                                    ); ?>" title="Hosts PENDING">
+                                        <?= $servicegroup->hosts_pending; ?> PENDING
+                                    </a>
+                                </div>
+                                <!-- End of Hosts PENDING -->
+<?php endif ?>
+                            </td>
+                            <td>
+<?php if ($servicegroup->services_critical_handled || $servicegroup->services_critical_unhandled): ?>
+                                <!-- Services CRITICAL -->
+                                <div class="box entry state_critical <?= $servicegroup->services_critical_unhandled ? '' : 'handled'; ?>">
+<?php if ($servicegroup->services_critical_unhandled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'         => 2,
+                                            'service_acknowledged'  => 0,
+                                            'service_in_downtime'   => 0,
+                                            'host_problem'          => 0,
+                                            'servicegroup'          => $servicegroup->servicegroup,
+                                            'sort'                  => 'service_severity'
+                                        )
+                                    ); ?>" title="Services CRITICAL Unhandled">
+                                        <?= $servicegroup->services_critical_unhandled; ?> CRITICAL
+                                    </a>
+<?php endif ?>
+<?php if ($servicegroup->services_critical_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'     => 2,
+                                            'service_handled'   => 1,
+                                            'servicegroup'      => $servicegroup->servicegroup,
+                                            'sort'              => 'service_severity'
+                                        )
+                                    ); ?>" title="Services CRITICAL Handled">
+                                        <?= $servicegroup->services_critical_handled . ' ' . ($servicegroup->services_critical_unhandled ? $this->translate('Acknowledged') : 'CRITICAL'); ?>
+                                    </a>
+<?php endif ?>
+                                </div>
+                                <!-- End of Services CRITICAL -->
+<?php endif ?>
+<?php if ($servicegroup->services_warning_handled || $servicegroup->services_warning_unhandled): ?>
+                                <!-- Services WARNING -->
+                                <div class="box entry state_warning <?= $servicegroup->services_warning_unhandled ? '' : 'handled'; ?>">
+<?php if ($servicegroup->services_warning_unhandled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'         => 1,
+                                            'service_acknowledged'  => 0,
+                                            'service_in_downtime'   => 0,
+                                            'host_problem'          => 0,
+                                            'servicegroup'          => $servicegroup->servicegroup,
+                                            'sort'                  => 'service_severity'
+                                        )
+                                    ); ?>" title="Services WARNING Unhandled">
+                                        <?= $servicegroup->services_warning_unhandled; ?> WARNING
+                                    </a>
+<?php endif ?>
+<?php if ($servicegroup->services_warning_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'     => 1,
+                                            'service_handled'   => 1,
+                                            'servicegroup'      => $servicegroup->servicegroup,
+                                            'sort'              => 'service_severity'
+                                        )
+                                    ); ?>" title="Services WARNING Handled">
+                                        <?= $servicegroup->services_warning_handled . ' ' . ($servicegroup->services_warning_unhandled ? $this->translate('Acknowledged') : 'WARNING'); ?>
+                                    </a>
+<?php endif ?>
+                                </div>
+                                <!-- End of Services WARNING -->
+<?php endif ?>
+<?php if ($servicegroup->services_unknown_handled || $servicegroup->services_unknown_unhandled): ?>
+                                <!-- Services UNKNOWN -->
+                                <div class="box entry state_unknown <?= $servicegroup->services_unknown_unhandled ? '' : 'handled'; ?>">
+<?php if ($servicegroup->services_unknown_unhandled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'         => 3,
+                                            'service_acknowledged'  => 0,
+                                            'service_in_downtime'   => 0,
+                                            'host_problem'          => 0,
+                                            'servicegroup'          => $servicegroup->servicegroup,
+                                            'sort'                  => 'service_severity'
+                                        )
+                                    ); ?>" title="Services UNKNOWN Unhandled">
+                                        <?= $servicegroup->services_unknown_unhandled; ?> UNKNOWN
+                                    </a>
+<?php endif ?>
+<?php if ($servicegroup->services_unknown_handled): ?>
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state'     => 3,
+                                            'service_handled'   => 1,
+                                            'servicegroup'      => $servicegroup->servicegroup,
+                                            'sort'              => 'service_severity'
+                                        )
+                                    ); ?>" title="Services UNKNOWN Handled">
+                                        <?= $servicegroup->services_unknown_handled . ' ' . ($servicegroup->services_unknown_unhandled ? $this->translate('Acknowledged') : 'UNKNOWN'); ?>
+                                    </a>
+<?php endif ?>
+                                </div>
+                                <!-- End of Services UNKNOWN -->
+<?php endif ?>
+<?php if ($servicegroup->services_ok): ?>
+                                <!-- Services OK -->
+                                <div class="box entry state_ok">
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state' => 0,
+                                            'servicegroup'  => $servicegroup->servicegroup,
+                                            'sort'          => 'service_severity'
+                                        )
+                                    ); ?>" title="Services OK">
+                                        <?= $servicegroup->services_ok; ?> OK
+                                    </a>
+                                </div>
+                                <!-- End of Services OK -->
+<?php endif ?>
+<?php if ($servicegroup->services_pending): ?>
+                                <!-- Services PENDING -->
+                                <div class="box entry state_pending">
+                                    <a href="<?= $this->href(
+                                        'monitoring/list/services',
+                                        array(
+                                            'service_state' => 99,
+                                            'servicegroup'  => $servicegroup->servicegroup,
+                                            'sort'          => 'service_severity'
+                                        )
+                                    ); ?>" title="Services PENDING">
+                                        <?= $servicegroup->services_pending; ?> PENDING
+                                    </a>
+                                </div>
+                                <!-- End of Services PENDING -->
+<?php endif ?>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
-        <?php endforeach; ?>
+        </div>
+<?php endforeach; ?>
     </div>
 </div>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
index 9b94d0d0d..d71d4283d 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
@@ -90,15 +90,15 @@
                                 'services_ok_not_checked'           => $this->statusSummary->services_ok_not_checked_on_ok_hosts,
                                 'services_pending'                  => $this->statusSummary->services_pending_on_ok_hosts,
                                 'services_pending_not_checked'      => $this->statusSummary->services_pending_not_checked_on_ok_hosts,
-                                'services_warning'                  => $this->statusSummary->services_warning_on_ok_hosts,
+                                'services_warning_handled'          => $this->statusSummary->services_warning_handled_on_ok_hosts,
                                 'services_warning_unhandled'        => $this->statusSummary->services_warning_unhandled_on_ok_hosts,
                                 'services_warning_passive'          => $this->statusSummary->services_warning_passive_on_ok_hosts,
                                 'services_warning_not_checked'      => $this->statusSummary->services_warning_not_checked_on_ok_hosts,
-                                'services_critical'                 => $this->statusSummary->services_critical_on_ok_hosts,
+                                'services_critical_handled'         => $this->statusSummary->services_critical_handled_on_ok_hosts,
                                 'services_critical_unhandled'       => $this->statusSummary->services_critical_unhandled_on_ok_hosts,
                                 'services_critical_passive'         => $this->statusSummary->services_critical_passive_on_ok_hosts,
                                 'services_critical_not_checked'     => $this->statusSummary->services_critical_not_checked_on_ok_hosts,
-                                'services_unknown'                  => $this->statusSummary->services_unknown_on_ok_hosts,
+                                'services_unknown_handled'          => $this->statusSummary->services_unknown_handled_on_ok_hosts,
                                 'services_unknown_unhandled'        => $this->statusSummary->services_unknown_unhandled_on_ok_hosts,
                                 'services_unknown_passive'          => $this->statusSummary->services_unknown_passive_on_ok_hosts,
                                 'services_unknown_not_checked'      => $this->statusSummary->services_unknown_not_checked_on_ok_hosts
diff --git a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
index f2ebc1f8a..484bbb65e 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
@@ -1,17 +1,19 @@
-<?php if ($services_critical): ?>
+<?php if ($services_critical_handled || $services_critical_unhandled): ?>
 <div class="box entry state_critical <?= $services_critical_unhandled ? '' : 'handled'; ?>">
-    <a href="<?= $this->href(
-        'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 2)
-    ); ?>">
-        <?= $services_critical; ?> CRITICAL
-    </a>
 <?php if ($services_critical_unhandled): ?>
     <a href="<?= $this->href(
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 2, 'service_handled' => 0)
+        array('host_problem' => $host_problem, 'service_state' => 2, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
     ); ?>">
-        <?= $services_critical_unhandled . ' ' . $this->translate('Unhandled'); ?>
+        <?= $services_critical_unhandled; ?> CRITICAL
+    </a>
+<?php endif ?>
+<?php if ($services_critical_handled): ?>
+    <a href="<?= $this->href(
+        'monitoring/list/services',
+        array('host_problem' => $host_problem, 'service_state' => 2, 'service_handled' => 1)
+    ); ?>">
+        <?= $services_critical_handled . ' ' . ($services_critical_unhandled ? $this->translate('Acknowledged') : 'CRITICAL'); ?>
     </a>
 <?php endif ?>
 <?php if ($services_critical_passive): ?>
@@ -66,20 +68,22 @@
 <?php endif ?>
 </div>
 <?php endif ?>
-<?php if ($services_warning): ?>
+<?php if ($services_warning_handled || $services_warning_unhandled): ?>
 <div class="box entry state_warning <?= $services_warning_unhandled ? '' : 'handled'; ?>">
-    <a href="<?= $this->href(
-        'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 1)
-    ); ?>">
-        <?= $services_warning; ?> WARNING
-    </a>
 <?php if ($services_warning_unhandled): ?>
     <a href="<?= $this->href(
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 1, 'service_handled' => 0)
+        array('host_problem' => $host_problem, 'service_state' => 1, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
     ); ?>">
-        <?= $services_warning_unhandled . ' ' . $this->translate('Unhandled'); ?>
+        <?= $services_warning_unhandled; ?> WARNING
+    </a>
+<?php endif ?>
+<?php if ($services_warning_handled): ?>
+    <a href="<?= $this->href(
+        'monitoring/list/services',
+        array('host_problem' => $host_problem, 'service_state' => 1, 'service_handled' => 1)
+    ); ?>">
+        <?= $services_warning_handled . ' ' . ($services_warning_unhandled ? $this->translate('Acknowledged') : 'WARNING'); ?>
     </a>
 <?php endif ?>
 <?php if ($services_warning_passive): ?>
@@ -134,20 +138,22 @@
 <?php endif ?>
 </div>
 <?php endif ?>
-<?php if ($services_unknown): ?>
+<?php if ($services_unknown_handled || $services_unknown_unhandled): ?>
 <div class="box entry state_unknown <?= $services_unknown_unhandled ? '' : 'handled'; ?>">
-    <a href="<?= $this->href(
-        'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 3)
-    ); ?>">
-        <?= $services_unknown; ?> UNKNOWN
-    </a>
 <?php if ($services_unknown_unhandled): ?>
     <a href="<?= $this->href(
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 3, 'service_handled' => 0)
+        array('host_problem' => $host_problem, 'service_state' => 3, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
     ); ?>">
-        <?= $services_unknown_unhandled . ' ' . $this->translate('Unhandled'); ?>
+        <?= $services_unknown_unhandled; ?> UNKNOWN
+    </a>
+<?php endif ?>
+<?php if ($services_unknown_handled): ?>
+    <a href="<?= $this->href(
+        'monitoring/list/services',
+        array('host_problem' => $host_problem, 'service_state' => 3, 'service_handled' => 1)
+    ); ?>">
+        <?= $services_unknown_handled . ' ' . ($services_unknown_unhandled ? $this->translate('Acknowledged') : 'UNKNOWN'); ?>
     </a>
 <?php endif ?>
 <?php if ($services_unknown_passive): ?>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
index 2600fca23..35610e636 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
@@ -11,20 +11,22 @@
             <tbody>
                 <tr>
                     <td>
-<?php if ($this->statusSummary->hosts_down): ?>
+<?php if ($this->statusSummary->hosts_down_handled || $this->statusSummary->hosts_down_unhandled): ?>
                         <div class="box entry state_down <?= $this->statusSummary->hosts_down_unhandled ? '' : 'handled'; ?>">
-                            <a href="<?= $this->href(
-                                'monitoring/list/hosts',
-                                array('host_state' => 1)
-                            ); ?>">
-                                <?= $this->statusSummary->hosts_down; ?> DOWN
-                            </a>
 <?php if ($this->statusSummary->hosts_down_unhandled): ?>
                             <a href="<?= $this->href(
                                 'monitoring/list/hosts',
                                 array('host_state' => 1, 'host_unhandled' => 1)
                             ); ?>">
-                                <?= $this->statusSummary->hosts_down_unhandled . ' ' . $this->translate('Unhandled'); ?>
+                                <?= $this->statusSummary->hosts_down_unhandled; ?> DOWN
+                            </a>
+<?php endif ?>
+<?php if ($this->statusSummary->hosts_down_handled): ?>
+                            <a href="<?= $this->href(
+                                'monitoring/list/hosts',
+                                array('host_state' => 1, 'host_handled' => 1)
+                            ); ?>">
+                                <?= $this->statusSummary->hosts_down_handled . ' ' . $this->statusSummary->hosts_down_unhandled ? $this->translate('Acknowledged') : 'DOWN'; ?>
                             </a>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_down_passive): ?>
@@ -77,20 +79,22 @@
 <?php endif ?>
                         </div>
 <?php endif ?>
-<?php if ($this->statusSummary->hosts_unreachable): ?>
+<?php if ($this->statusSummary->hosts_unreachable_handled || $this->statusSummary->hosts_unreachable_unhandled): ?>
                         <div class="box entry state_unreachable <?= $this->statusSummary->hosts_unreachable_unhandled ? '' : 'handled'; ?>">
-                            <a href="<?= $this->href(
-                                'monitoring/list/hosts',
-                                array('host_state' => 2)
-                            ); ?>">
-                                <?= $this->statusSummary->hosts_unreachable; ?> UNREACHABLE
-                            </a>
 <?php if ($this->statusSummary->hosts_unreachable_unhandled): ?>
                             <a href="<?= $this->href(
                                 'monitoring/list/hosts',
                                 array('host_state' => 2, 'host_unhandled' => 1)
                             ); ?>">
-                                <?= $this->statusSummary->hosts_unreachable_unhandled . ' ' . $this->translate('Unhandled'); ?>
+                                <?= $this->statusSummary->hosts_unreachable_unhandled; ?> UNREACHABLE
+                            </a>
+<?php endif ?>
+<?php if ($this->statusSummary->hosts_unreachable_handled): ?>
+                            <a href="<?= $this->href(
+                                'monitoring/list/hosts',
+                                array('host_state' => 2, 'host_handled' => 1)
+                            ); ?>">
+                                <?= $this->statusSummary->hosts_unreachable . ' ' . $this->statusSummary->hosts_unreachable_unhandled ? $this->translate('Acknowledged') : 'UNREACHABLE'; ?>
                             </a>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_unreachable_passive): ?>
@@ -153,15 +157,15 @@
                                 'services_ok_not_checked'           => $this->statusSummary->services_ok_not_checked_on_problem_hosts,
                                 'services_pending'                  => $this->statusSummary->services_pending_on_problem_hosts,
                                 'services_pending_not_checked'      => $this->statusSummary->services_pending_not_checked_on_problem_hosts,
-                                'services_warning'                  => $this->statusSummary->services_warning_on_problem_hosts,
+                                'services_warning_handled'          => $this->statusSummary->services_warning_handled_on_problem_hosts,
                                 'services_warning_unhandled'        => $this->statusSummary->services_warning_unhandled_on_problem_hosts,
                                 'services_warning_passive'          => $this->statusSummary->services_warning_passive_on_problem_hosts,
                                 'services_warning_not_checked'      => $this->statusSummary->services_warning_not_checked_on_problem_hosts,
-                                'services_critical'                 => $this->statusSummary->services_critical_on_problem_hosts,
+                                'services_critical_handled'         => $this->statusSummary->services_critical_handled_on_problem_hosts,
                                 'services_critical_unhandled'       => $this->statusSummary->services_critical_unhandled_on_problem_hosts,
                                 'services_critical_passive'         => $this->statusSummary->services_critical_passive_on_problem_hosts,
                                 'services_critical_not_checked'     => $this->statusSummary->services_critical_not_checked_on_problem_hosts,
-                                'services_unknown'                  => $this->statusSummary->services_unknown_on_problem_hosts,
+                                'services_unknown_handled'          => $this->statusSummary->services_unknown_handled_on_problem_hosts,
                                 'services_unknown_unhandled'        => $this->statusSummary->services_unknown_unhandled_on_problem_hosts,
                                 'services_unknown_passive'          => $this->statusSummary->services_unknown_passive_on_problem_hosts,
                                 'services_unknown_not_checked'      => $this->statusSummary->services_unknown_not_checked_on_problem_hosts
diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml
index 6089b5017..fb866d2ef 100644
--- a/modules/monitoring/application/views/scripts/tactical/index.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/index.phtml
@@ -7,6 +7,7 @@
     <div class="boxview" data-base-target="col2">
         <?= $this->render('tactical/components/problem_hosts.phtml'); ?>
         <?= $this->render('tactical/components/ok_hosts.phtml'); ?>
+        <br />
         <?= $this->render('tactical/components/hostservicechecks.phtml'); ?>
         <?= $this->render('tactical/components/monitoringfeatures.phtml'); ?>
     </div>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
index a50237389..b4c2f252f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@@ -91,15 +91,15 @@ class StatusSummaryQuery extends IdoQuery
             'services_ok_not_checked_on_ok_hosts'               => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_pending_on_ok_hosts'                      => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 99 THEN 1 ELSE 0 END)',
             'services_pending_not_checked_on_ok_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_warning_on_ok_hosts'                      => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 THEN 1 ELSE 0 END)',
+            'services_warning_handled_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
             'services_warning_unhandled_on_ok_hosts'            => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'services_warning_passive_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_warning_not_checked_on_ok_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_critical_on_ok_hosts'                     => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 THEN 1 ELSE 0 END)',
+            'services_critical_handled_on_ok_hosts'             => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
             'services_critical_unhandled_on_ok_hosts'           => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'services_critical_passive_on_ok_hosts'             => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_critical_not_checked_on_ok_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_on_ok_hosts'                      => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 THEN 1 ELSE 0 END)',
+            'services_unknown_handled_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
             'services_unknown_unhandled_on_ok_hosts'            => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'services_unknown_passive_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_unknown_not_checked_on_ok_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 0 OR host_state = 99) AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
@@ -107,15 +107,15 @@ class StatusSummaryQuery extends IdoQuery
             'services_ok_not_checked_on_problem_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_pending_on_problem_hosts'                 => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 99 THEN 1 ELSE 0 END)',
             'services_pending_not_checked_on_problem_hosts'     => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_warning_on_problem_hosts'                 => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 THEN 1 ELSE 0 END)',
+            'services_warning_handled_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
             'services_warning_unhandled_on_problem_hosts'       => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'services_warning_passive_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_warning_not_checked_on_problem_hosts'     => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_critical_on_problem_hosts'                => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 THEN 1 ELSE 0 END)',
+            'services_critical_handled_on_problem_hosts'        => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
             'services_critical_unhandled_on_problem_hosts'      => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'services_critical_passive_on_problem_hosts'        => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_critical_not_checked_on_problem_hosts'    => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_on_problem_hosts'                 => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 THEN 1 ELSE 0 END)',
+            'services_unknown_handled_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
             'services_unknown_unhandled_on_problem_hosts'       => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'services_unknown_passive_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_unknown_not_checked_on_problem_hosts'     => 'SUM(CASE WHEN object_type = \'service\' AND (host_state = 1 OR host_state = 2) AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)'
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 731f15af2..caf622e59 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -44,6 +44,7 @@ class ServiceStatus extends DataView
             'host_state_type',
             'host_last_state_change',
             'host_address',
+            'host_problem',
             'host_handled',
             'service_description',
             'service_display_name',
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
index 77fa3d574..efba4e37d 100644
--- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
@@ -92,15 +92,15 @@ class StatusSummary extends DataView
             'services_ok_not_checked_on_ok_hosts',
             'services_pending_on_ok_hosts',
             'services_pending_not_checked_on_ok_hosts',
-            'services_warning_on_ok_hosts',
+            'services_warning_handled_on_ok_hosts',
             'services_warning_unhandled_on_ok_hosts',
             'services_warning_passive_on_ok_hosts',
             'services_warning_not_checked_on_ok_hosts',
-            'services_critical_on_ok_hosts',
+            'services_critical_handled_on_ok_hosts',
             'services_critical_unhandled_on_ok_hosts',
             'services_critical_passive_on_ok_hosts',
             'services_critical_not_checked_on_ok_hosts',
-            'services_unknown_on_ok_hosts',
+            'services_unknown_handled_on_ok_hosts',
             'services_unknown_unhandled_on_ok_hosts',
             'services_unknown_passive_on_ok_hosts',
             'services_unknown_not_checked_on_ok_hosts',
@@ -108,15 +108,15 @@ class StatusSummary extends DataView
             'services_ok_not_checked_on_problem_hosts',
             'services_pending_on_problem_hosts',
             'services_pending_not_checked_on_problem_hosts',
-            'services_warning_on_problem_hosts',
+            'services_warning_handled_on_problem_hosts',
             'services_warning_unhandled_on_problem_hosts',
             'services_warning_passive_on_problem_hosts',
             'services_warning_not_checked_on_problem_hosts',
-            'services_critical_on_problem_hosts',
+            'services_critical_handled_on_problem_hosts',
             'services_critical_unhandled_on_problem_hosts',
             'services_critical_passive_on_problem_hosts',
             'services_critical_not_checked_on_problem_hosts',
-            'services_unknown_on_problem_hosts',
+            'services_unknown_handled_on_problem_hosts',
             'services_unknown_unhandled_on_problem_hosts',
             'services_unknown_passive_on_problem_hosts',
             'services_unknown_not_checked_on_problem_hosts'