Adding upstream version 2.11.4.upstream/2.11.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

18 files changed, 2180 insertions, 0 deletions

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
new file mode 100644
index 0000000..c7fb86a
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -0,0 +1,61 @@
+<?php if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->render('list/components/selectioninfo.phtml') ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $comments->hasResult()): ?>
+    <p><?= $this->translate('No comments found matching the filter') ?></p>
+</div>
+<?php return; endif ?>
+    <table data-base-target="_next"
+           class="table-row-selectable common-table multiselect"
+           data-icinga-multiselect-url="<?= $this->href('monitoring/comments/show') ?>"
+           data-icinga-multiselect-related="<?= $this->href("monitoring/comments") ?>"
+           data-icinga-multiselect-data="comment_id">
+    <thead class="print-only">
+        <tr>
+            <th><?= $this->translate('Type') ?></th>
+            <th><?= $this->translate('Comment') ?></th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($comments->peekAhead($this->compact) as $comment): ?>
+        <tr href="<?=  $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>">
+            <td class="icon-col">
+                <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)) ?>
+            </td>
+            <td>
+                <?= $this->partial(
+                    'partials/comment/comment-detail.phtml',
+                    array(
+                        'comment'        => $comment,
+                        'delCommentForm' => isset($delCommentForm) ? $delCommentForm : null
+                        // Form is unset if the current user lacks the respective permission
+                )) ?>
+            </td>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($comments->hasMore()): ?>
+    <div class="dont-print action-links">
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url()->without(array('showCompact', 'limit')),
+            null,
+            array(
+                'class'               => 'action-link',
+                'data-base-target'    => '_next'
+            )
+        ) ?>
+    </div>
+<?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
new file mode 100644
index 0000000..4b9f1cd
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -0,0 +1,92 @@
+<?php
+use Icinga\Module\Monitoring\Web\Widget\StateBadges;
+use Icinga\Web\Url;
+
+// Don't fetch rows until they are actually needed to improve dashlet performance
+if (! $stats instanceof stdClass) {
+    $stats = $stats->fetchRow();
+}
+?>
+<div class="hosts-summary dont-print">
+    <span class="hosts-link"><?= $this->qlink(
+        sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total),
+        // @TODO(el): Fix that
+        Url::fromPath('monitoring/list/hosts')->setParams(isset($baseFilter) ? $baseFilter->getUrlParams() : array()),
+        null,
+        array('title' => sprintf(
+            $this->translatePlural('List %u host', 'List all %u hosts', $stats->hosts_total),
+            $stats->hosts_total
+        ))
+    ) ?>&#58;</span>
+<?php
+$stateBadges = new StateBadges();
+$stateBadges
+    ->setBaseFilter(isset($baseFilter) ? $baseFilter : null)
+    ->setUrl('monitoring/list/hosts')
+    ->add(
+        StateBadges::STATE_UP,
+        $stats->hosts_up,
+        array(
+            'host_state' => 0
+        ),
+        'List %u host that is currently in state UP',
+        'List %u hosts which are currently in state UP',
+        array($stats->hosts_up)
+    )
+    ->add(
+        StateBadges::STATE_DOWN,
+        $stats->hosts_down_unhandled,
+        array(
+            'host_state'    => 1,
+            'host_handled'  => 0
+        ),
+        'List %u host that is currently in state DOWN',
+        'List %u hosts which are currently in state DOWN',
+        array($stats->hosts_down_unhandled)
+    )
+    ->add(
+        StateBadges::STATE_DOWN_HANDLED,
+        $stats->hosts_down_handled,
+        array(
+            'host_state'      => 1,
+            'host_handled'    => 1
+        ),
+        'List %u host that is currently in state DOWN (Acknowledged)',
+        'List %u hosts which are currently in state DOWN (Acknowledged)',
+        array($stats->hosts_down_handled)
+    )
+    ->add(
+        StateBadges::STATE_UNREACHABLE,
+        $stats->hosts_unreachable_unhandled,
+        array(
+            'host_state'    => 2,
+            'host_handled'  => 0
+        ),
+        'List %u host that is currently in state UNREACHABLE',
+        'List %u hosts which are currently in state UNREACHABLE',
+        array($stats->hosts_unreachable_unhandled)
+    )
+    ->add(
+        StateBadges::STATE_UNREACHABLE_HANDLED,
+        $stats->hosts_unreachable_handled,
+        array(
+            'host_state'    => 2,
+            'host_handled'  => 1
+        ),
+        'List %u host that is currently in state UNREACHABLE (Acknowledged)',
+        'List %u hosts which are currently in state UNREACHABLE (Acknowledged)',
+        array($stats->hosts_unreachable_handled)
+    )
+    ->add(
+        StateBadges::STATE_PENDING,
+        $stats->hosts_pending,
+        array(
+            'host_state' => 99
+        ),
+        'List %u host that is currently in state PENDING',
+        'List %u hosts which are currently in state PENDING',
+        array($stats->hosts_pending)
+    );
+echo $stateBadges->render();
+?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml b/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml
new file mode 100644
index 0000000..ec0fb85
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml
@@ -0,0 +1,15 @@
+<?php
+$helpMessage = $this->translate(
+    'Press and hold the Ctrl key while clicking on rows to select multiple rows or press and hold the Shift key to'
+    .' select a range of rows',
+    'Multi-selection help'
+);
+?>
+<div class="selection-info" title="<?= $this->escape($helpMessage) ?>">
+    <?= sprintf(
+        /// TRANSLATORS: Please leave %s as it is because the selection counter is wrapped in a span tag for updating
+        /// the counter via JavaScript
+        $this->translate('%s row(s) selected', 'Multi-selection count'),
+        '<span class="selection-info-count">0</span>'
+    ) ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
new file mode 100644
index 0000000..73a3b57
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -0,0 +1,118 @@
+<?php
+use Icinga\Module\Monitoring\Web\Widget\StateBadges;
+use Icinga\Web\Url;
+
+// Don't fetch rows until they are actually needed, to improve dashlet performance
+if (! $stats instanceof stdClass) {
+    $stats = $stats->fetchRow();
+}
+?>
+<div class="services-summary dont-print">
+    <span class="services-link"><?= $this->qlink(
+        sprintf($this->translatePlural(
+            '%u Service', '%u Services', $stats->services_total),
+            $stats->services_total
+        ),
+        // @TODO(el): Fix that
+        Url::fromPath('monitoring/list/services')->setParams(isset($baseFilter) ? $baseFilter->getUrlParams() : array()),
+        null,
+        array('title' => sprintf(
+            $this->translatePlural('List %u service', 'List all %u services', $stats->services_total),
+            $stats->services_total
+        ))
+    ) ?>&#58;</span>
+<?php
+$stateBadges = new StateBadges();
+$stateBadges
+    ->setBaseFilter(isset($baseFilter) ? $baseFilter : null)
+    ->setUrl('monitoring/list/services')
+    ->add(
+        StateBadges::STATE_OK,
+        $stats->services_ok,
+        array(
+            'service_state' => 0
+        ),
+        'List %u service that is currently in state OK',
+        'List %u services which are currently in state OK',
+        array($stats->services_ok)
+    )
+    ->add(
+        StateBadges::STATE_CRITICAL,
+        $stats->services_critical_unhandled,
+        array(
+            'service_state'     => 2,
+            'service_handled'   => 0
+        ),
+        'List %u service that is currently in state CRITICAL',
+        'List %u services which are currently in state CRITICAL',
+        array($stats->services_critical_unhandled)
+    )
+    ->add(
+        StateBadges::STATE_CRITICAL_HANDLED,
+        $stats->services_critical_handled,
+        array(
+            'service_state'     => 2,
+            'service_handled'   => 1
+        ),
+        'List %u handled service that is currently in state CRITICAL',
+        'List %u handled services which are currently in state CRITICAL',
+        array($stats->services_critical_handled)
+    )
+    ->add(
+        StateBadges::STATE_UNKNOWN,
+        $stats->services_unknown_unhandled,
+        array(
+            'service_state'     => 3,
+            'service_handled'   => 0
+        ),
+        'List %u service that is currently in state UNKNOWN',
+        'List %u services which are currently in state UNKNOWN',
+        array($stats->services_unknown_unhandled)
+    )
+    ->add(
+        StateBadges::STATE_UNKNOWN_HANDLED,
+        $stats->services_unknown_handled,
+        array(
+            'service_state'     => 3,
+            'service_handled'   => 1
+        ),
+        'List %u handled service that is currently in state UNKNOWN',
+        'List %u handled services which are currently in state UNKNOWN',
+        array($stats->services_unknown_handled)
+
+    )
+    ->add(
+        StateBadges::STATE_WARNING,
+        $stats->services_warning_unhandled,
+        array(
+            'service_state'     => 1,
+            'service_handled'   => 0
+        ),
+        'List %u service that is currently in state WARNING',
+        'List %u services which are currently in state WARNING',
+        array($stats->services_warning_unhandled)
+    )
+    ->add(
+        StateBadges::STATE_WARNING_HANDLED,
+        $stats->services_warning_handled,
+        array(
+            'service_state'     => 1,
+            'service_handled'   => 1
+        ),
+        'List %u handled service that is currently in state WARNING',
+        'List %u handled services which are currently in state WARNING',
+        array($stats->services_warning_handled)
+    )
+    ->add(
+        StateBadges::STATE_PENDING,
+        $stats->services_pending,
+        array(
+            'service_state' => 99
+        ),
+        'List %u handled service that is currently in state PENDING',
+        'List %u handled services which are currently in state PENDING',
+        array($stats->services_pending)
+    );
+echo $stateBadges->render();
+?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
new file mode 100644
index 0000000..125aeea
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -0,0 +1,53 @@
+<?php
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $contactGroups->hasResult()): ?>
+    <p><?= $this->translate('No contact groups found matching the filter') ?></p>
+</div>
+<?php return; endif ?>
+    <table class="common-table table-row-selectable" data-base-target="_next">
+        <thead>
+            <tr>
+                <th></th>
+                <th><?= $this->translate('Contact Group') ?></th>
+                <th><?= $this->translate('Alias') ?></th>
+            </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($contactGroups as $contactGroup): ?>
+            <tr>
+                <td class="count-col">
+                    <span class="badge"><?= $contactGroup->contact_count ?></span>
+                </td>
+                <th>
+                    <?= $this->qlink(
+                        $contactGroup->contactgroup_name,
+                        'monitoring/list/contacts',
+                        array('contactgroup_name' => $contactGroup->contactgroup_name),
+                        array('title' => sprintf(
+                            $this->translate('Show detailed information about %s'),
+                            $contactGroup->contactgroup_name
+                        ))
+                    ) ?>
+                </th>
+            <td>
+            <?php if ($contactGroup->contactgroup_name !== $contactGroup->contactgroup_alias): ?>
+                <?= $contactGroup->contactgroup_alias ?>
+            <?php endif ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
new file mode 100644
index 0000000..42ec778
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -0,0 +1,83 @@
+<?php if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $contacts->hasResult()): ?>
+    <p><?= $this->translate('No contacts found matching the filter') ?></p>
+</div>
+<?php return; endif ?>
+    <table class="common-table table-row-selectable" data-base-target="_next">
+    <thead>
+        <tr>
+            <th><?= $this->translate('Name') ?></th>
+            <th><?= $this->translate('Email') ?></th>
+            <th><?= $this->translate('Pager') ?></th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($contacts->peekAhead($this->compact) as $contact): ?>
+        <tr>
+        <th>
+            <?= $this->qlink(
+                $contact->contact_name,
+                'monitoring/show/contact',
+                array('contact_name' => $contact->contact_name),
+                array(
+                    'title' => sprintf(
+                        $this->translate('Show detailed information about %s'),
+                        $contact->contact_alias
+                    )
+                )
+            ) ?>
+        </th>
+        <td>
+            <?= $this->translate('Email') ?>:
+            <a href="mailto:<?= $contact->contact_email ?>"
+               title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias) ?>"
+               aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias) ?>">
+                <?= $this->escape($contact->contact_email) ?>
+            </a>
+        </td>
+            <td>
+            <?php if ($contact->contact_pager): ?>
+                <?= $this->escape($contact->contact_pager) ?>
+            <?php endif ?>
+            </td>
+
+            <?php if ($contact->contact_notify_service_timeperiod): ?>
+            <td>
+                <?= $this->escape($contact->contact_notify_service_timeperiod) ?>
+            </td>
+            <?php endif ?>
+
+            <?php if ($contact->contact_notify_host_timeperiod): ?>
+            <td>
+                <?= $this->escape($contact->contact_notify_host_timeperiod) ?>
+            </td>
+            <?php endif ?>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($contacts->hasMore()): ?>
+    <div class="dont-print action-links">
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url()->without(array('showCompact', 'limit')),
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_next'
+            )
+        ) ?>
+    </div>
+<?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
new file mode 100644
index 0000000..46ce0bb
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -0,0 +1,64 @@
+<?php
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->render('list/components/selectioninfo.phtml') ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $downtimes->hasResult()): ?>
+    <p><?= $this->translate('No downtimes found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table class="common-table state-table table-row-selectable multiselect"
+           data-base-target="_next"
+           data-icinga-multiselect-url="<?= $this->href('monitoring/downtimes/show') ?>"
+           data-icinga-multiselect-controllers="<?= $this->href("monitoring/downtimes") ?>"
+           data-icinga-multiselect-data="downtime_id">
+    <thead class="print-only">
+        <tr>
+            <th><?= $this->translate('State') ?></th>
+            <th><?= $this->translate('Downtime') ?></th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($downtimes->peekAhead($this->compact) as $downtime):
+        if (isset($downtime->service_description)) {
+            $this->isService = true;
+            $this->stateName = Service::getStateText($downtime->service_state);
+        } else {
+            $this->isService = false;
+            $this->stateName = Host::getStateText($downtime->host_state);
+        }
+        // Set downtime for partials
+        $this->downtime = $downtime;
+        ?>
+        <tr href="<?= $this->href('monitoring/downtime/show', array('downtime_id' => $downtime->id)) ?>">
+            <?= $this->render('partials/downtime/downtime-header.phtml') ?>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($downtimes->hasMore()): ?>
+    <div class="dont-print action-links">
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url()->without(array('showCompact', 'limit')),
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_next'
+            )
+        ) ?>
+    </div>
+<?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
new file mode 100644
index 0000000..8809c53
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -0,0 +1,123 @@
+<?php
+use Icinga\Data\Filter\Filter;
+use Icinga\Web\Widget\Chart\HistoryColorGrid;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->form ?>
+</div>
+<?php endif ?>
+<div class="content" data-base-target="_next">
+<?php
+
+$settings = array(
+    'cnt_up' => array(
+        'tooltip' => $this->translate('%d hosts ok on %s'),
+        'color' => '#49DF96',
+        'opacity' => '0.55'
+    ),
+    'cnt_unreachable_hard' => array(
+        'tooltip' => $this->translate('%d hosts unreachable on %s'),
+        'color' => '#77AAFF',
+        'opacity' => '0.55'
+    ),
+    'cnt_critical_hard' => array(
+        'tooltip' => $this->translate('%d services critical on %s'),
+        'color' => '#ff5566',
+        'opacity' => '0.9'
+    ),
+
+    'cnt_warning_hard' => array(
+        'tooltip' => $this->translate('%d services warning on %s'),
+        'color' => '#ffaa44',
+        'opacity' => '1.0'
+    ),
+
+    'cnt_down_hard' => array(
+        'tooltip' => $this->translate('%d hosts down on %s'),
+        'color' => '#ff5566',
+        'opacity' => '0.9'
+    ),
+    'cnt_unknown_hard' => array(
+        'tooltip' => $this->translate('%d services unknown on %s'),
+        'color' => '#cc77ff',
+        'opacity' => '0.7'
+    ),
+    'cnt_ok' => array(
+        'tooltip' => $this->translate('%d services ok on %s'),
+        'color' => '#49DF96',
+        'opacity' => '0.55'
+    )
+);
+
+$data = array();
+foreach ($summary as $entry) {
+    $day = $entry->day;
+    $value = $entry->$column;
+    $caption = sprintf(
+        $settings[$column]['tooltip'],
+        $value,
+        $this->formatDate(strtotime($day ?? ''))
+    );
+    $linkFilter = Filter::matchAll(
+        Filter::expression('timestamp', '<', strtotime($day . ' 23:59:59')),
+        Filter::expression('timestamp', '>', strtotime($day . ' 00:00:00')),
+        $form->getFilter(),
+        $filter
+    );
+    $data[$day] = array(
+        'value'   => $value,
+        'caption' => $caption,
+        'url'     => $this->href('monitoring/list/eventhistory?' . $linkFilter->toQueryString())
+    );
+}
+
+if (! $summary->hasResult()) {
+    echo $this->translate('No state changes in the selected time period.') . '</div>';
+    return;
+}
+
+$from = intval($form->getValue('from', strtotime('3 months ago')));
+$to = intval($form->getValue('to', time()));
+
+// don't display more than ten years, or else this will get really slow
+if ($to - $from > 315360000) {
+    $from = $to - 315360000;
+}
+
+$f = new DateTime();
+$f->setTimestamp($from);
+$t = new DateTime();
+$t->setTimestamp($to);
+$diff = $t->diff($f);
+$step = 124;
+
+for ($i = 0; $i < $diff->days; $i += $step) {
+    $end = clone $f;
+    if ($diff->days - $i > $step) {
+        // full range, move last day to next chunk
+        $end->add(new DateInterval('P' . ($step - 1) . 'D'));
+    } else {
+        // include last day
+        $end->add(new DateInterval('P' . ($diff->days - $i) . 'D'));
+    }
+    $grid = new HistoryColorGrid(null, $f->getTimestamp(), $end->getTimestamp());
+    $grid->setColor($settings[$column]['color']);
+    $grid->opacity = $settings[$column]['opacity'];
+    $grid->orientation = $orientation;
+    $grid->setData($data);
+    $grids[] = $grid;
+
+    $f->add(new DateInterval('P' . $step . 'D'));
+}
+?>
+<div style="width: 33.5em;">
+<?php foreach (array_reverse($grids) as $key => $grid): ?>
+    <div style=" <?= $this->orientation === 'horizontal' ? '' : 'display: inline-block; vertical-align: top; top; margin: 0.5em;' ?>">
+        <?= $grid; ?>
+        <?= $this->orientation === 'horizontal' ? '<br />' : '' ?>
+    </div>
+<?php endforeach ?>
+    </div>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
new file mode 100644
index 0000000..0573e8a
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -0,0 +1,22 @@
+<?php
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<?= $this->partial(
+    'partials/event-history.phtml',
+    array(
+        'compact' => $this->compact,
+        'history' => $history,
+        'isOverview' => true,
+        'translationDomain' => $this->translationDomain
+    )
+) ?>
+
diff --git a/modules/monitoring/application/views/scripts/list/hostgroup-grid.phtml b/modules/monitoring/application/views/scripts/list/hostgroup-grid.phtml
new file mode 100644
index 0000000..34498d0
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/hostgroup-grid.phtml
@@ -0,0 +1,173 @@
+<?php if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <div class="sort-controls-container">
+        <?= $this->sortBox ?>
+        <a href="<?= $this->href('monitoring/list/hostgroups')->addFilter($this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
+           title="<?= $this->translate('Toogle grid view mode') ?>">
+            <?= $this->icon('th-list', null, ['class' => '-inactive']) ?>
+            <?= $this->icon('th-thumb-empty', null, ['class' => '-active']) ?>
+        </a>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content" data-base-target="_next">
+<?php /** @var \Icinga\Module\Monitoring\DataView\Hostgroup $hostGroups */
+if (! $hostGroups->hasResult()): ?>
+    <p><?= $this->translate('No host groups found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+<div class="group-grid">
+<?php foreach ($hostGroups as $hostGroup): ?>
+    <div class="group-grid-cell">
+    <?php if ($hostGroup->hosts_down_unhandled > 0): ?>
+        <?= $this->qlink(
+            $hostGroup->hosts_down_unhandled,
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
+            [
+                'hostgroup_name'    => $hostGroup->hostgroup_name,
+                'host_handled'      => 0,
+                'host_state'        => 1
+            ],
+            [
+                'class' => 'state-down',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %u host that is currently in state DOWN in the host group "%s"',
+                        'List %u hosts which are currently in state DOWN in the host group "%s"',
+                        $hostGroup->hosts_down_unhandled
+                    ),
+                    $hostGroup->hosts_down_unhandled,
+                    $hostGroup->hostgroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($hostGroup->hosts_unreachable_unhandled > 0): ?>
+        <?= $this->qlink(
+            $hostGroup->hosts_unreachable_unhandled,
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
+            [
+                'hostgroup_name'    => $hostGroup->hostgroup_name,
+                'host_handled'      => 0,
+                'host_state'        => 2
+            ],
+            [
+                'class' => 'state-unreachable',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %u host that is currently in state UNREACHABLE in the host group "%s"',
+                        'List %u hosts which are currently in state UNREACHABLE in the host group "%s"',
+                        $hostGroup->hosts_unreachable_unhandled
+                    ),
+                    $hostGroup->hosts_unreachable_unhandled,
+                    $hostGroup->hostgroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($hostGroup->hosts_down_handled > 0): ?>
+        <?= $this->qlink(
+            $hostGroup->hosts_down_handled,
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
+            [
+                'hostgroup_name'    => $hostGroup->hostgroup_name,
+                'host_handled'      => 1,
+                'host_state'        => 1
+            ],
+            [
+                'class' => 'state-down handled',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %u host that is currently in state DOWN (Acknowledged) in the host group "%s"',
+                        'List %u hosts which are currently in state DOWN (Acknowledged) in the host group "%s"',
+                        $hostGroup->hosts_down_handled
+                    ),
+                    $hostGroup->hosts_down_handled,
+                    $hostGroup->hostgroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($hostGroup->hosts_unreachable_handled > 0): ?>
+        <?= $this->qlink(
+            $hostGroup->hosts_unreachable_handled,
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
+            [
+                'hostgroup_name'    => $hostGroup->hostgroup_name,
+                'host_handled'      => 0,
+                'host_state'        => 2
+            ],
+            [
+                'class' => 'state-unreachable handled',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %u host that is currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+                        'List %u hosts which are currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+                        $hostGroup->hosts_unreachable_handled
+                    ),
+                    $hostGroup->hosts_unreachable_handled,
+                    $hostGroup->hostgroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($hostGroup->hosts_pending > 0): ?>
+        <?= $this->qlink(
+            $hostGroup->hosts_pending,
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
+            [
+                'hostgroup_name'    => $hostGroup->hostgroup_name,
+                'host_state'        => 99
+            ],
+            [
+                'class' => 'state-pending',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %u host that is currently in state PENDING in the host group "%s"',
+                        'List %u hosts which are currently in state PENDING in the host group "%s"',
+                        $hostGroup->hosts_pending
+                    ),
+                    $hostGroup->hosts_pending,
+                    $hostGroup->hostgroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($hostGroup->hosts_up > 0): ?>
+        <?= $this->qlink(
+            $hostGroup->hosts_up,
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
+            [
+                'hostgroup_name'    => $hostGroup->hostgroup_name,
+                'host_state'        => 0
+            ],
+            [
+                'class' => 'state-up',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %u host that is currently in state UP in the host group "%s"',
+                        'List %u hosts which are currently in state UP in the host group "%s"',
+                        $hostGroup->hosts_up
+                    ),
+                    $hostGroup->hosts_up,
+                    $hostGroup->hostgroup_alias
+                )
+            ]
+        ) ?>
+    <?php else: ?>
+        <div class="state-none">
+            0
+        </div>
+    <?php endif ?>
+        <?= $this->qlink(
+            $hostGroup->hostgroup_alias,
+            $this->url('monitoring/list/hosts')->addFilter($this->filterEditor->getFilter()),
+            ['hostgroup_name' => $hostGroup->hostgroup_name],
+            [
+                'title' => sprintf(
+                    $this->translate('List all hosts in the group "%s"'),
+                    $hostGroup->hostgroup_alias
+                )
+            ]
+        ) ?>
+    </div>
+<?php endforeach ?>
+</div>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
new file mode 100644
index 0000000..a0592c8
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -0,0 +1,296 @@
+<?php
+
+use Icinga\Module\Monitoring\Web\Widget\StateBadges;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+        <a href="<?= $this->href('monitoring/list/hostgroup-grid')->addFilter(clone $this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
+           title="<?= $this->translate('Toogle grid view mode') ?>">
+            <?= $this->icon('th-list', null, ['class' => '-active']) ?>
+            <?= $this->icon('th-thumb-empty', null, ['class' => '-inactive']) ?>
+        </a>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+
+<div class="content">
+<?php /** @var \Icinga\Module\Monitoring\DataView\Hostgroup $hostGroups */ if (! $hostGroups->hasResult()): ?>
+    <p><?= $this->translate('No host groups found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table class="common-table table-row-selectable" data-base-target="_next">
+    <thead>
+        <tr>
+            <th></th>
+            <th><?= $this->translate('Host Group') ?></th>
+            <th><?= $this->translate('Host States') ?></th>
+            <th></th>
+            <th><?= $this->translate('Service States') ?></th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($hostGroups->peekAhead($this->compact) as $hostGroup): ?>
+        <tr>
+            <td class="count-col">
+                <span class="badge"><?= $hostGroup->hosts_total ?></span>
+            </td>
+            <th>
+                <?= $this->qlink(
+                    $hostGroup->hostgroup_alias,
+                    $this
+                        ->url('monitoring/list/hosts')
+                        ->setParams(['hostgroup_name' => $hostGroup->hostgroup_name])
+                        ->addFilter($this->filterEditor->getFilter()),
+                    ['sort' => 'host_severity'],
+                    ['title' => sprintf(
+                        $this->translate('List all hosts in the group "%s"'),
+                        $hostGroup->hostgroup_alias
+                    )]
+                ) ?>
+            </th>
+            <td>
+                <?php
+                $stateBadges = new StateBadges();
+                $stateBadges
+                    ->setUrl('monitoring/list/hosts')
+                    ->setBaseFilter($this->filterEditor->getFilter())
+                    ->add(
+                        StateBadges::STATE_UP,
+                        $hostGroup->hosts_up,
+                        array(
+                            'host_state'        => 0,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'host_severity'
+                        ),
+                        'List %u host that is currently in state UP in the host group "%s"',
+                        'List %u hosts which are currently in state UP in the host group "%s"',
+                        array($hostGroup->hosts_up, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_DOWN,
+                        $hostGroup->hosts_down_unhandled,
+                        array(
+                            'host_state'        => 1,
+                            'host_acknowledged' => 0,
+                            'host_in_downtime'  => 0,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'host_severity'
+                        ),
+                        'List %u host that is currently in state DOWN in the host group "%s"',
+                        'List %u hosts which are currently in state DOWN in the host group "%s"',
+                        array($hostGroup->hosts_down_unhandled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_DOWN_HANDLED,
+                        $hostGroup->hosts_down_handled,
+                        array(
+                            'host_state'      => 1,
+                            'host_handled'    => 1,
+                            'hostgroup_name'  => $hostGroup->hostgroup_name,
+                            'sort'            => 'host_severity'
+                        ),
+                        'List %u host that is currently in state DOWN (Acknowledged) in the host group "%s"',
+                        'List %u hosts which are currently in state DOWN (Acknowledged) in the host group "%s"',
+                        array($hostGroup->hosts_down_handled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_UNREACHABLE,
+                        $hostGroup->hosts_unreachable_unhandled,
+                        array(
+                            'host_state'        => 2,
+                            'host_acknowledged' => 0,
+                            'host_in_downtime'  => 0,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'host_severity'
+                        ),
+                        'List %u host that is currently in state UNREACHABLE in the host group "%s"',
+                        'List %u hosts which are currently in state UNREACHABLE in the host group "%s"',
+                        array($hostGroup->hosts_unreachable_unhandled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_UNREACHABLE_HANDLED,
+                        $hostGroup->hosts_unreachable_handled,
+                        array(
+                            'host_state'      => 2,
+                            'host_handled'    => 1,
+                            'hostgroup_name'  => $hostGroup->hostgroup_name,
+                            'sort'            => 'host_severity'
+                        ),
+                        'List %u host that is currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+                        'List %u hosts which are currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+                        array($hostGroup->hosts_unreachable_handled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_PENDING,
+                        $hostGroup->hosts_pending,
+                        array(
+                            'host_state'        => 99,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'host_severity'
+                        ),
+                        'List %u host that is currently in state PENDING in the host group "%s"',
+                        'List %u hosts which are currently in state PENDING in the host group "%s"',
+                        array($hostGroup->hosts_pending, $hostGroup->hostgroup_alias)
+                    );
+                echo $stateBadges->render();
+                ?>
+            </td>
+            <td class="count-col">
+                <?= $this->qlink(
+                    $hostGroup->services_total,
+                    $this
+                        ->url('monitoring/list/services')
+                        ->setParams(['hostgroup_name' => $hostGroup->hostgroup_name])
+                        ->addFilter($this->filterEditor->getFilter()),
+                    ['sort' => 'service_severity'],
+                    [
+                        'title' => sprintf(
+                            $this->translate('List all services of all hosts in host group "%s"'),
+                            $hostGroup->hostgroup_alias
+                        ),
+                        'class' => 'badge'
+                    ]
+                ) ?>
+            </td>
+            <td>
+                <?php
+                $stateBadges = new StateBadges();
+                $stateBadges
+                    ->setUrl('monitoring/list/services')
+                    ->setBaseFilter($this->filterEditor->getFilter())
+                    ->add(
+                        StateBadges::STATE_OK,
+                        $hostGroup->services_ok,
+                        array(
+                            'service_state'     => 0,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %u service that is currently in state OK on hosts in the host group "%s"',
+                        'List %u services which are currently in state OK on hosts in the host group "%s"',
+                        array($hostGroup->services_ok, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_CRITICAL,
+                        $hostGroup->services_critical_unhandled,
+                        array(
+                            'service_state'         => 2,
+                            'service_acknowledged'  => 0,
+                            'service_in_downtime'   => 0,
+                            'host_problem'          => 0,
+                            'hostgroup_name'        => $hostGroup->hostgroup_name,
+                            'sort'                  => 'service_severity'
+                        ),
+                        'List %u service that is currently in state CRITICAL on hosts in the host group "%s"',
+                        'List %u services which are currently in state CRITICAL on hosts in the host group "%s"',
+                        array($hostGroup->services_critical_unhandled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_CRITICAL_HANDLED,
+                        $hostGroup->services_critical_handled,
+                        array(
+                            'service_state'     => 2,
+                            'service_handled'   => 1,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %u service that is currently in state CRITICAL (Acknowledged) on hosts in the host group "%s"',
+                        'List %u services which are currently in state CRITICAL (Acknowledged) on hosts in the host group "%s"',
+                        array($hostGroup->services_critical_handled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_UNKNOWN,
+                        $hostGroup->services_unknown_unhandled,
+                        array(
+                            'service_state'         => 3,
+                            'service_acknowledged'  => 0,
+                            'service_in_downtime'   => 0,
+                            'host_problem'          => 0,
+                            'hostgroup_name'        => $hostGroup->hostgroup_name,
+                            'sort'                  => 'service_severity'
+                        ),
+                        'List %u service that is currently in state UNKNOWN on hosts in the host group "%s"',
+                        'List %u services which are currently in state UNKNOWN on hosts in the host group "%s"',
+                        array($hostGroup->services_unknown_unhandled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_UNKNOWN_HANDLED,
+                        $hostGroup->services_unknown_handled,
+                        array(
+                            'service_state'     => 3,
+                            'service_handled'   => 1,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %u service that is currently in state UNKNOWN (Acknowledged) on hosts in the host group "%s"',
+                        'List %u services which are currently in state UNKNOWN (Acknowledged) on hosts in the host group "%s"',
+                        array($hostGroup->services_unknown_handled, $hostGroup->hostgroup_alias)
+
+                    )
+                    ->add(
+                        StateBadges::STATE_WARNING,
+                        $hostGroup->services_warning_unhandled,
+                        array(
+                            'service_state'         => 1,
+                            'service_acknowledged'  => 0,
+                            'service_in_downtime'   => 0,
+                            'host_problem'          => 0,
+                            'hostgroup_name'        => $hostGroup->hostgroup_name,
+                            'sort'                  => 'service_severity'
+                        ),
+                        'List %u service that is currently in state WARNING on hosts in the host group "%s"',
+                        'List %u services which are currently in state WARNING on hosts in the host group "%s"',
+                        array($hostGroup->services_warning_unhandled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_WARNING_HANDLED,
+                        $hostGroup->services_warning_handled,
+                        array(
+                            'service_state'     => 1,
+                            'service_handled'   => 1,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %u service that is currently in state WARNING (Acknowledged) on hosts in the host group "%s"',
+                        'List %u services which are currently in state WARNING (Acknowledged) on hosts in the host group "%s"',
+                        array($hostGroup->services_warning_handled, $hostGroup->hostgroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_PENDING,
+                        $hostGroup->services_pending,
+                        array(
+                            'service_state'     => 99,
+                            'hostgroup_name'    => $hostGroup->hostgroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %u service that is currently in state PENDING on hosts in the host group "%s"',
+                        'List %u services which are currently in state PENDING on hosts in the host group "%s"',
+                        array($hostGroup->services_pending, $hostGroup->hostgroup_alias)
+                    );
+                echo $stateBadges->render();
+                ?>
+            </td>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($hostGroups->hasMore()): ?>
+    <div class="dont-print action-links">
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url()->without(array('showCompact', 'limit')),
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_next'
+            )
+        ) ?>
+    </div>
+<?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
new file mode 100644
index 0000000..6d7674e
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -0,0 +1,106 @@
+<?php
+use Icinga\Date\DateFormatter;
+use Icinga\Module\Monitoring\Object\Host;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $hosts->hasResult()): ?>
+    <p><?= $this->translate('No hosts found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table data-base-target="_next"
+           class="table-row-selectable state-table multiselect"
+           data-icinga-multiselect-url="<?= $this->href('monitoring/hosts/show') ?>"
+           data-icinga-multiselect-controllers="<?= $this->href("monitoring/hosts") ?>"
+           data-icinga-multiselect-data="host">
+    <thead class="print-only">
+        <tr>
+            <th><?= $this->translate('State') ?></th>
+            <th><?= $this->translate('Host') ?></th>
+        <?php foreach($this->addColumns as $col): ?>
+            <th><?= $this->escape($col) ?></th>
+        <?php endforeach ?>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach($hosts->peekAhead($this->compact) as $host):
+        $hostStateName = Host::getStateText($host->host_state);
+        $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
+        $hostCheckOverdue = $host->host_next_update < time();?>
+        <tr<?= $hostCheckOverdue ? ' class="state-outdated"' : '' ?>>
+            <td class="state-col state-<?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
+                <div class="state-label">
+                <?php if ($hostCheckOverdue): ?>
+                    <?= $this->icon('clock', sprintf($this->translate('Overdue %s'), DateFormatter::timeSince($host->host_next_update))) ?>
+                <?php endif ?>
+                    <?= Host::getStateText($host->host_state, true) ?>
+                </div>
+                <?php if ((int) $host->host_state !== 99): ?>
+                    <div class="state-meta">
+                        <?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
+                    <?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?>
+                        <div><?= $this->translate('Soft', 'Soft state') ?> <?= $host->host_attempt ?></div>
+                    <?php endif ?>
+                    </div>
+                <?php endif ?>
+            </td>
+            <td>
+                <div class="state-header">
+                    <?= $this->iconImage()->host($host) ?>
+                    <?= $this->qlink(
+                        $host->host_display_name,
+                        $hostLink,
+                        null,
+                        array(
+                            'title' => sprintf(
+                                $this->translate('Show detailed information for host %s'),
+                                $host->host_display_name
+                            ),
+                            'class' => 'rowaction'
+                        )
+                    ) ?>
+                    <span class="state-icons"><?= $this->hostFlags($host) ?></span>
+                </div>
+                <p class="overview-plugin-output"><?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true, $host->host_check_command) ?></p>
+            </td>
+        <?php foreach($this->addColumns as $col): ?>
+          <?php if ($host->$col && preg_match('~^_(host|service)_([a-zA-Z0-9_]+)$~', $col, $m)): ?>
+            <td><?= $this->escape(\Icinga\Module\Monitoring\Object\MonitoredObject::protectCustomVars([$m[2] => $host->$col])[$m[2]]) ?></td>
+          <?php else: ?>
+            <td><?= $this->escape($host->$col) ?></td>
+          <?php endif ?>
+        <?php endforeach ?>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($hosts->hasMore()): ?>
+    <div class="dont-print action-links">
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url()->without(array('showCompact', 'limit')),
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_next'
+            )
+        ) ?>
+    </div>
+<?php endif ?>
+</div>
+<?php if (! $this->compact): ?>
+<div class="monitoring-statusbar dont-print">
+    <?= $this->render('list/components/hostssummary.phtml') ?>
+    <?= $this->render('list/components/selectioninfo.phtml') ?>
+</div>
+<?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
new file mode 100644
index 0000000..51ef432
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -0,0 +1,124 @@
+<?php
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $notifications->hasResult()): ?>
+    <p><?= $this->translate('No notifications found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table data-base-target="_next" class="table-row-selectable state-table">
+    <tbody>
+    <?php foreach ($notifications->peekAhead($this->compact) as $notification):
+        if (isset($notification->service_description)) {
+            $isService = true;
+            $stateLabel = Service::getStateText($notification->notification_state, true);
+            $stateName = Service::getStateText($notification->notification_state);
+        } else {
+            $isService = false;
+            $stateLabel = Host::getStateText($notification->notification_state, true);
+            $stateName = Host::getStateText($notification->notification_state);
+        }
+    ?>
+        <tr href="<?= $this->href('monitoring/event/show', ['id' => $notification->id, 'type' => 'notify']) ?>">
+            <td class="state-col state-<?= $stateName ?>">
+                <div class="state-label"><?= $stateLabel ?></div>
+                <div class="state-meta">
+                    <?= $this->formatDateTime($notification->notification_timestamp) ?>
+                </div>
+            </td>
+            <td>
+                <div class="state-header">
+                <?php if ($isService) {
+                    echo '<span class="service-on">';
+                    echo sprintf(
+                        $this->translate('%s on %s', 'service on host'),
+                        $this->qlink(
+                            $notification->service_display_name,
+                            'monitoring/service/show',
+                            [
+                                'host' => $notification->host_name,
+                                'service' => $notification->service_description
+                            ],
+                            [
+                                'title' => sprintf(
+                                    $this->translate('Show detailed information for service %s on host %s'),
+                                    $notification->service_display_name,
+                                    $notification->host_display_name
+                                )
+                            ]
+                        ),
+                        $this->qlink(
+                            $notification->host_display_name,
+                            'monitoring/host/show',
+                            ['host' => $notification->host_name],
+                            [
+                                'title' => sprintf(
+                                    $this->translate('Show detailed information for host %s'),
+                                    $notification->host_display_name
+                                )
+                            ]
+                        )
+                    );
+                    echo '</span>';
+                } else {
+                    echo $this->qlink(
+                        $notification->host_display_name,
+                        'monitoring/host/show',
+                        ['host' => $notification->host_name],
+                        [
+                            'title' => sprintf(
+                                $this->translate('Show detailed information for host %s'),
+                                $notification->host_display_name
+                            )
+                        ]
+                    );
+                } ?>
+                <?php if (! $this->contact): ?>
+                    <div class="notification-recipient">
+                    <?php if ($notification->notification_contact_name): ?>
+                        <?= sprintf(
+                            $this->translate('Sent to %s'),
+                            $this->qlink(
+                                $notification->notification_contact_name,
+                                'monitoring/show/contact',
+                                array('contact_name' => $notification->notification_contact_name)
+                            )
+                        ) ?>
+                    <?php else: ?>
+                        <?= $this->translate('Not sent out to any contact') ?>
+                    <?php endif ?>
+                    </div>
+                <?php endif ?>
+                </div>
+                <p class="overview-plugin-output"><?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?></p>
+            </td>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($notifications->hasMore()): ?>
+    <div class="action-links">
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('showCompact', 'limit')),
+            null,
+            array(
+                'class'             => 'action-link',
+                'data-base-target'  => '_next'
+            )
+        ); ?>
+    </div>
+<?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid-flipped.phtml b/modules/monitoring/application/views/scripts/list/servicegrid-flipped.phtml
new file mode 100644
index 0000000..d7b4c78
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/servicegrid-flipped.phtml
@@ -0,0 +1,144 @@
+<?php
+use Icinga\Data\Filter\Filter;
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Web\Url;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->problemToggle ?>
+    <div class="sort-controls-container">
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content" data-base-target="_next">
+    <?php if (empty($pivotData)): ?>
+    <p><?= $this->translate('No services found matching the filter.') ?></p>
+</div>
+<?php return; endif;
+$serviceFilter = Filter::matchAny();
+foreach ($pivotData as $serviceDescription => $_) {
+    $serviceFilter->orFilter(Filter::where('service_description', $serviceDescription));
+}
+?>
+<table class="service-grid-table">
+    <thead>
+        <tr>
+            <th><?= $this->partial(
+                'joystickPagination.phtml',
+                'default',
+                array(
+                    'flippable'      => true,
+                    'xAxisPaginator' => $horizontalPaginator,
+                    'yAxisPaginator' => $verticalPaginator
+                )
+            ) ?></th>
+            <?php foreach ($pivotHeader['cols'] as $hostName => $hostAlias): ?>
+            <th class="rotate-45"><div><span><?= $this->qlink(
+                $this->ellipsis($hostAlias, 24),
+                Url::fromPath('monitoring/list/services')->addFilter(
+                    Filter::matchAll($serviceFilter, Filter::where('host_name', $hostName))
+                ),
+                null,
+                array('title' => sprintf($this->translate('List all reported services on host %s'), $hostAlias)),
+                false
+            ) ?></span></div></th>
+            <?php endforeach ?>
+        </tr>
+    </thead>
+    <tbody>
+
+    <?php $i = 0 ?>
+    <?php foreach ($pivotHeader['rows'] as $serviceDescription => $serviceDisplayName): ?>
+        <tr>
+            <th><?php
+                $hostFilter = Filter::matchAny();
+                foreach ($pivotData[$serviceDescription] as $hostName => $_) {
+                    $hostFilter->orFilter(Filter::where('host_name', $hostName));
+                }
+                echo $this->qlink(
+                    $serviceDisplayName,
+                    Url::fromPath('monitoring/list/services')->addFilter(
+                        Filter::matchAll($hostFilter, Filter::where('service_description', $serviceDescription))
+                    ),
+                    null,
+                    array('title' => sprintf(
+                        $this->translate('List all services with the name "%s" on all reported hosts'),
+                        $serviceDisplayName
+                    ))
+                );
+            ?></th>
+        <?php foreach (array_keys($pivotHeader['cols']) as $hostName): ?>
+            <td><?php
+            $service = $pivotData[$serviceDescription][$hostName];
+            if ($service === null): ?>
+                <span aria-hidden="true">&middot;</span>
+                <?php continue; endif ?>
+            <?php $ariaDescribedById = $this->protectId($service->host_name . '_' . $service->service_description . '_desc') ?>
+                <span class="sr-only" id="<?= $ariaDescribedById ?>">
+                    <?= $this->escape($service->service_output) ?>
+                </span>
+                <?= $this->qlink(
+                    '',
+                    'monitoring/service/show',
+                    array(
+                        'host'    => $hostName,
+                        'service' => $serviceDescription
+                    ),
+                    array(
+                        'aria-describedby'    => $ariaDescribedById,
+                        'aria-label'          => sprintf(
+                            $this->translate('Show detailed information for service %s on host %s'),
+                            $service->service_display_name,
+                            $service->host_display_name
+                        ),
+                        'class'               => 'service-grid-link state-' . Service::getStateText($service->service_state) . ($service->service_handled ? ' handled' : ''),
+                        'title'               => $service->service_output
+                    )
+                ) ?>
+            </td>
+        <?php endforeach ?>
+        <?php if (! $this->compact && $this->horizontalPaginator->getPages()->pageCount > 1): ?>
+            <td>
+                <?php $expandLink = $this->qlink(
+                    $this->translate('Load more'),
+                    Url::fromRequest(),
+                    array(
+                        'limit' => ($this->horizontalPaginator->getItemCountPerPage() + 20)
+                            . ','
+                            .  $this->verticalPaginator->getItemCountPerPage()
+                    ),
+                    array(
+                        'class'             => 'action-link',
+                        'data-base-target'  => '_self'
+                    )
+                ) ?>
+                <?= ++$i === (int) ceil(count($pivotHeader['rows']) / 2) ? $expandLink : '' ?>
+            </td>
+        <?php endif ?>
+        </tr>
+    <?php endforeach ?>
+    <?php if (! $this->compact && $this->verticalPaginator->getPages()->pageCount > 1): ?>
+        <tr>
+            <td colspan="<?= count($pivotHeader['cols']) + 1?>" class="service-grid-table-more">
+                <?php echo $this->qlink(
+                    $this->translate('Load more'),
+                    Url::fromRequest(),
+                    array(
+                        'limit' => $this->horizontalPaginator->getItemCountPerPage()
+                            . ','
+                            . ($this->verticalPaginator->getItemCountPerPage() + 20)
+                    ),
+                    array(
+                        'class'             => 'action-link',
+                        'data-base-target'  => '_self'
+                    )
+                ) ?>
+            </td>
+        </tr>
+    <?php endif ?>
+    </tbody>
+</table>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
new file mode 100644
index 0000000..d0ed4bc
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -0,0 +1,144 @@
+<?php
+use Icinga\Data\Filter\Filter;
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Web\Url;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->problemToggle ?>
+    <div class="sort-controls-container">
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content" data-base-target="_next">
+<?php if (empty($pivotData)): ?>
+    <p><?= $this->translate('No services found matching the filter.') ?></p>
+</div>
+<?php return; endif;
+$hostFilter = Filter::matchAny();
+foreach ($pivotData as $hostName => $_) {
+    $hostFilter->orFilter(Filter::where('host_name', $hostName));
+}
+?>
+    <table class="service-grid-table">
+    <thead>
+        <tr>
+            <th><?= $this->partial(
+                'joystickPagination.phtml',
+                'default',
+                array(
+                    'flippable'      => true,
+                    'xAxisPaginator' => $horizontalPaginator,
+                    'yAxisPaginator' => $verticalPaginator
+                )
+            ) ?></th>
+        <?php foreach ($pivotHeader['cols'] as $serviceDescription => $serviceDisplayName): ?>
+            <th class="rotate-45"><div><span><?= $this->qlink(
+                $this->ellipsis($serviceDisplayName, 24),
+                Url::fromPath('monitoring/list/services')->addFilter(
+                    Filter::matchAll($hostFilter, Filter::where('service_description', $serviceDescription))
+                ),
+                null,
+                array('title' => sprintf(
+                    $this->translate('List all services with the name "%s" on all reported hosts'),
+                    $serviceDisplayName
+                )),
+                false
+            ) ?></span></div></th>
+        <?php endforeach ?>
+        </tr>
+    </thead>
+    <tbody>
+
+    <?php $i = 0 ?>
+    <?php foreach ($pivotHeader['rows'] as $hostName => $hostDisplayName): ?>
+        <tr>
+            <th><?php
+                $serviceFilter = Filter::matchAny();
+                foreach ($pivotData[$hostName] as $serviceName => $_) {
+                    $serviceFilter->orFilter(Filter::where('service_description', $serviceName));
+                }
+                echo $this->qlink(
+                    $hostDisplayName,
+                    Url::fromPath('monitoring/list/services')->addFilter(
+                        Filter::matchAll($serviceFilter, Filter::where('host_name', $hostName))
+                    ),
+                    null,
+                    array('title' => sprintf($this->translate('List all reported services on host %s'), $hostDisplayName))
+                );
+            ?></th>
+        <?php foreach (array_keys($pivotHeader['cols']) as $serviceDescription): ?>
+            <td>
+            <?php
+            $service = $pivotData[$hostName][$serviceDescription];
+            if ($service === null): ?>
+                <span aria-hidden="true">&middot;</span>
+            <?php continue; endif ?>
+                <?php $ariaDescribedById = $this->protectId($service->host_name . '_' . $service->service_description . '_desc') ?>
+                <span class="sr-only" id="<?= $ariaDescribedById ?>">
+                    <?= $this->escape($service->service_output) ?>
+                </span>
+                <?= $this->qlink(
+                    '',
+                    'monitoring/service/show',
+                    array(
+                        'host'    => $hostName,
+                        'service' => $serviceDescription
+                    ),
+                    array(
+                        'aria-describedby'    => $ariaDescribedById,
+                        'aria-label'          => sprintf(
+                            $this->translate('Show detailed information for service %s on host %s'),
+                            $service->service_display_name,
+                            $service->host_display_name
+                        ),
+                        'class'               => 'service-grid-link state-' . Service::getStateText($service->service_state) . ($service->service_handled ? ' handled' : ''),
+                        'title'               => $service->service_output
+                    )
+                ) ?>
+            </td>
+        <?php endforeach ?>
+        <?php if (! $this->compact && $this->horizontalPaginator->getPages()->pageCount > 1): ?>
+            <td>
+                <?php $expandLink = $this->qlink(
+                    $this->translate('Load more'),
+                    Url::fromRequest(),
+                    array(
+                        'limit' => (
+                                $this->horizontalPaginator->getItemCountPerPage() + 20) . ','
+                             .  $this->verticalPaginator->getItemCountPerPage()
+                    ),
+                    array(
+                        'class'             => 'action-link',
+                        'data-base-target'  => '_self'
+                    )
+                ) ?>
+                <?= ++$i === (int) (count($pivotHeader['rows']) / 2) ? $expandLink : '' ?>
+            </td>
+        <?php endif ?>
+        </tr>
+    <?php endforeach ?>
+    <?php if (! $this->compact && $this->verticalPaginator->getPages()->pageCount > 1): ?>
+        <tr>
+            <td colspan="<?= count($pivotHeader['cols']) + 1?>" class="service-grid-table-more">
+                <?php echo $this->qlink(
+                    $this->translate('Load more'),
+                    Url::fromRequest(),
+                    array(
+                        'limit' => $this->horizontalPaginator->getItemCountPerPage() . ',' .
+                            ($this->verticalPaginator->getItemCountPerPage() + 20)
+                    ),
+                    array(
+                        'class'             => 'action-link',
+                        'data-base-target'  => '_self'
+                    )
+                ) ?>
+            </td>
+        </tr>
+    <?php endif ?>
+    </tbody>
+    </table>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/servicegroup-grid.phtml b/modules/monitoring/application/views/scripts/list/servicegroup-grid.phtml
new file mode 100644
index 0000000..5ea6d17
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/servicegroup-grid.phtml
@@ -0,0 +1,217 @@
+<?php if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <div class="sort-controls-container">
+        <?= $this->sortBox ?>
+        <a href="<?= $this->href('monitoring/list/servicegroups')->addFilter($this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
+           title="<?= $this->translate('Toogle grid view mode') ?>">
+            <?= $this->icon('th-list', null, ['class' => '-inactive']) ?>
+            <?= $this->icon('th-thumb-empty', null, ['class' => '-active']) ?>
+        </a>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content" data-base-target="_next">
+<?php /** @var \Icinga\Module\Monitoring\DataView\Servicegroup $serviceGroups */
+if (! $serviceGroups->hasResult()): ?>
+    <p><?= $this->translate('No service groups found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+<div class="group-grid">
+<?php foreach ($serviceGroups as $serviceGroup): ?>
+    <div class="group-grid-cell">
+    <?php if ($serviceGroup->services_critical_unhandled > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_critical_unhandled,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_handled'   => 0,
+                'service_state'     => 2
+            ],
+            [
+                'class' => 'state-critical',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currently in state CRITICAL in service group "%s"',
+                        'List %s services which are currently in state CRITICAL in service group "%s"',
+                        $serviceGroup->services_critical_unhandled
+                    ),
+                    $serviceGroup->services_critical_unhandled,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($serviceGroup->services_warning_unhandled > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_warning_unhandled,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_handled'   => 0,
+                'service_state'     => 1
+            ],
+            [
+                'class' => 'state-warning',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currently in state WARNING in service group "%s"',
+                        'List %s services which are currently in state WARNING in service group "%s"',
+                        $serviceGroup->services_warning_unhandled
+                    ),
+                    $serviceGroup->services_warning_unhandled,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($serviceGroup->services_unknown_unhandled > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_unknown_unhandled,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_handled'   => 0,
+                'service_state'     => 3
+            ],
+            [
+                'class' => 'state-unknown',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currently in state UNKNOWN in service group "%s"',
+                        'List %s services which are currently in state UNKNOWN in service group "%s"',
+                        $serviceGroup->services_unknown_unhandled
+                    ),
+                    $serviceGroup->services_unknown_unhandled,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($serviceGroup->services_critical_handled > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_critical_handled,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_handled'   => 1,
+                'service_state'     => 2
+            ],
+            [
+                'class' => 'state-critical handled',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currently in state CRITICAL (Acknowledged) in service group "%s"',
+                        'List %s services which are currently in state CRITICAL (Acknowledged) in service group "%s"',
+                        $serviceGroup->services_critical_handled
+                    ),
+                    $serviceGroup->services_critical_handled,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($serviceGroup->services_warning_handled > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_warning_handled,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_handled'   => 1,
+                'service_state'     => 1
+            ],
+            [
+                'class' => 'state-warning handled',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currently in state WARNING (Acknowledged) in service group "%s"',
+                        'List %s services which are currently in state WARNING (Acknowledged) in service group "%s"',
+                        $serviceGroup->services_warning_handled
+                    ),
+                    $serviceGroup->services_warning_handled,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($serviceGroup->services_unknown_handled > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_unknown_handled,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_handled'   => 1,
+                'service_state'     => 3
+            ],
+            [
+                'class' => 'state-unknown handled',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                        'List %s services which are currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                        $serviceGroup->services_unknown_handled
+                    ),
+                    $serviceGroup->services_unknown_handled,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($serviceGroup->services_pending > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_pending,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_state'     => 99
+            ],
+            [
+                'class' => 'state-pending',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currenlty in state PENDING in service group "%s"',
+                        'List %s services which are currently in state PENDING in service group "%s"',
+                        $serviceGroup->services_pending
+                    ),
+                    $serviceGroup->services_pending,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php elseif ($serviceGroup->services_ok > 0): ?>
+        <?= $this->qlink(
+            $serviceGroup->services_ok,
+            $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+            [
+                'servicegroup_name' => $serviceGroup->servicegroup_name,
+                'service_state'     => 0
+            ],
+            [
+                'class' => 'state-ok',
+                'title' => sprintf(
+                    $this->translatePlural(
+                        'List %s service that is currently in state OK in service group "%s"',
+                        'List %s services which are currently in state OK in service group "%s"',
+                        $serviceGroup->services_ok
+                    ),
+                    $serviceGroup->services_ok,
+                    $serviceGroup->servicegroup_alias
+                )
+            ]
+        ) ?>
+    <?php else: ?>
+        <div class="state-none">
+            0
+        </div>
+    <?php endif ?>
+    <?= $this->qlink(
+        $serviceGroup->servicegroup_alias,
+        $this->url('monitoring/list/servicegrid')->addFilter($this->filterEditor->getFilter()),
+        ['servicegroup_name' => $serviceGroup->servicegroup_name],
+        [
+            'title' => sprintf(
+                $this->translate('List all services in the group "%s"'),
+                $serviceGroup->servicegroup_alias
+            )
+        ]
+    ) ?>
+    </div>
+<?php endforeach ?>
+</div>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
new file mode 100644
index 0000000..c915b30
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -0,0 +1,184 @@
+<?php use Icinga\Module\Monitoring\Web\Widget\StateBadges;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+        <a href="<?= $this->href('monitoring/list/servicegroup-grid')->addFilter(clone $this->filterEditor->getFilter()) ?>" class="grid-toggle-link"
+           title="<?= $this->translate('Toogle grid view mode') ?>">
+            <?= $this->icon('th-list', null, ['class' => '-active']) ?>
+            <?= $this->icon('th-thumb-empty', null, ['class' => '-inactive']) ?>
+        </a>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $serviceGroups->hasResult()): ?>
+    <p><?= $this->translate('No service groups found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table class="table-row-selectable common-table" data-base-target="_next">
+    <thead>
+        <tr>
+            <th></th>
+            <th><?= $this->translate('Service Group') ?></th>
+            <th><?= $this->translate('Service States') ?></th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($serviceGroups->peekAhead($this->compact) as  $serviceGroup): ?>
+        <tr>
+            <td class="count-col">
+                <span class="badge"><?= $serviceGroup->services_total ?></span>
+            </td>
+            <th>
+                <?= $this->qlink(
+                    $serviceGroup->servicegroup_alias,
+                    $this
+                        ->url('monitoring/list/services')
+                        ->setParams(['servicegroup_name' => $serviceGroup->servicegroup_name])
+                        ->addFilter($this->filterEditor->getFilter()),
+                    ['sort' => 'service_severity'],
+                    ['title' => sprintf($this->translate('List all services in the group "%s"'),  $serviceGroup->servicegroup_alias)]
+                ) ?>
+            </th>
+            <td>
+                <?php
+                $stateBadges = new StateBadges();
+                $stateBadges
+                    ->setUrl('monitoring/list/services')
+                    ->setBaseFilter($this->filterEditor->getFilter())
+                    ->add(
+                        StateBadges::STATE_OK,
+                        $serviceGroup->services_ok,
+                        array(
+                            'service_state'     => 0,
+                            'servicegroup_name' => $serviceGroup->servicegroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %s service that is currently in state OK in service group "%s"',
+                        'List %s services which are currently in state OK in service group "%s"',
+                        array($serviceGroup->services_ok, $serviceGroup->servicegroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_CRITICAL,
+                        $serviceGroup->services_critical_unhandled,
+                        array(
+                            'service_state'         => 2,
+                            'service_acknowledged'  => 0,
+                            'service_in_downtime'   => 0,
+                            'host_problem'          => 0,
+                            'servicegroup_name'     => $serviceGroup->servicegroup_name,
+                            'sort'                  => 'service_severity'
+                        ),
+                        'List %s service that is currently in state CRITICAL in service group "%s"',
+                        'List %s services which are currently in state CRITICAL in service group "%s"',
+                        array($serviceGroup->services_critical_unhandled, $serviceGroup->servicegroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_CRITICAL_HANDLED,
+                        $serviceGroup->services_critical_handled,
+                        array(
+                            'service_state'     => 2,
+                            'service_handled'   => 1,
+                            'servicegroup_name' => $serviceGroup->servicegroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %s service that is currently in state CRITICAL (Acknowledged) in service group "%s"',
+                        'List %s services which are currently in state CRITICAL (Acknowledged) in service group "%s"',
+                        array($serviceGroup->services_critical_handled, $serviceGroup->servicegroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_UNKNOWN,
+                        $serviceGroup->services_unknown_unhandled,
+                        array(
+                            'service_state'         => 3,
+                            'service_acknowledged'  => 0,
+                            'service_in_downtime'   => 0,
+                            'host_problem'          => 0,
+                            'servicegroup_name'     => $serviceGroup->servicegroup_name,
+                            'sort'                  => 'service_severity'
+                        ),
+                        'List %s service that is currently in state UNKNOWN in service group "%s"',
+                        'List %s services which are currently in state UNKNOWN in service group "%s"',
+                        array($serviceGroup->services_unknown_unhandled, $serviceGroup->servicegroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_UNKNOWN_HANDLED,
+                        $serviceGroup->services_unknown_handled,
+                        array(
+                            'service_state'     => 3,
+                            'service_handled'   => 1,
+                            'servicegroup_name' => $serviceGroup->servicegroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %s service that is currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                        'List %s services which are currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                        array($serviceGroup->services_unknown_handled, $serviceGroup->servicegroup_alias)
+
+                    )
+                    ->add(
+                        StateBadges::STATE_WARNING,
+                        $serviceGroup->services_warning_unhandled,
+                        array(
+                            'service_state'         => 1,
+                            'service_acknowledged'  => 0,
+                            'service_in_downtime'   => 0,
+                            'host_problem'          => 0,
+                            'servicegroup_name'     => $serviceGroup->servicegroup_name,
+                            'sort'                  => 'service_severity'
+                        ),
+                        'List %s service that is currently in state WARNING in service group "%s"',
+                        'List %s services which are currently in state WARNING in service group "%s"',
+                        array($serviceGroup->services_warning_unhandled, $serviceGroup->servicegroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_WARNING_HANDLED,
+                        $serviceGroup->services_warning_handled,
+                        array(
+                            'service_state'     => 1,
+                            'service_handled'   => 1,
+                            'servicegroup_name' => $serviceGroup->servicegroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %s service that is currently in state WARNING (Acknowledged) in service group "%s"',
+                        'List %s services which are currently in state WARNING (Acknowledged) in service group "%s"',
+                        array($serviceGroup->services_warning_handled, $serviceGroup->servicegroup_alias)
+                    )
+                    ->add(
+                        StateBadges::STATE_PENDING,
+                        $serviceGroup->services_pending,
+                        array(
+                            'service_state'     => 99,
+                            'servicegroup_name' => $serviceGroup->servicegroup_name,
+                            'sort'              => 'service_severity'
+                        ),
+                        'List %s service that is currenlty in state PENDING in service group "%s"',
+                        'List %s services which are currently in state PENDING in service group "%s"',
+                        array($serviceGroup->services_pending, $serviceGroup->servicegroup_alias)
+                    );
+                echo $stateBadges->render();
+                ?>
+            </td>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($serviceGroups->hasMore()): ?>
+<div class="dont-print action-links">
+    <?= $this->qlink(
+        $this->translate('Show More'),
+        $this->url()->without(array('showCompact', 'limit')),
+        null,
+        array(
+            'class'             => 'action-link',
+            'data-base-target'  => '_next'
+        )
+    ) ?>
+</div>
+<?php endif ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
new file mode 100644
index 0000000..b2088e9
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -0,0 +1,161 @@
+<?php
+use Icinga\Date\DateFormatter;
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
+if (! $this->compact): ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <?= $this->paginator ?>
+    <div class="sort-controls-container">
+        <?= $this->limiter ?>
+        <?= $this->sortBox ?>
+    </div>
+    <?= $this->filterEditor ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php if (! $services->hasResult()): ?>
+    <p><?= $this->translate('No services found matching the filter.') ?></p>
+</div>
+<?php return; endif ?>
+    <table data-base-target="_next"
+           class="table-row-selectable state-table multiselect<?php if ($this->compact): ?> compact<?php endif ?>"
+           data-icinga-multiselect-url="<?= $this->href('monitoring/services/show') ?>"
+           data-icinga-multiselect-controllers="<?= $this->href('monitoring/services') ?>"
+           data-icinga-multiselect-data="service,host">
+    <thead class="print-only">
+        <tr>
+            <th><?= $this->translate('State') ?></th>
+            <th><?= $this->translate('Service') ?></th>
+        <?php foreach($this->addColumns as $col): ?>
+            <th><?= $this->escape($col) ?></th>
+        <?php endforeach ?>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($services->peekAhead($this->compact) as $service):
+        $serviceLink = $this->href(
+            'monitoring/service/show',
+            array(
+                'host'      => $service->host_name,
+                'service'   => $service->service_description
+            )
+        );
+        $hostLink = $this->href(
+            'monitoring/host/show',
+            array(
+                'host' => $service->host_name,
+            )
+        );
+        $serviceStateName = Service::getStateText($service->service_state);
+        $serviceCheckOverdue = $service->service_next_update < time(); ?>
+        <tr<?= $serviceCheckOverdue ? ' class="state-outdated"' : '' ?>>
+            <td class="state-col state-<?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
+                <div class="state-label">
+                <?php if ($serviceCheckOverdue): ?>
+                    <?= $this->icon('clock', sprintf($this->translate('Overdue %s'), DateFormatter::timeSince($service->service_next_update))) ?>
+                <?php endif ?>
+                    <?= Service::getStateText($service->service_state, true) ?>
+                </div>
+            <?php if ((int) $service->service_state !== 99): ?>
+                <div class="state-meta">
+                    <?= $this->timeSince($service->service_last_state_change, $this->compact) ?>
+                <?php if ((int) $service->service_state > 0 && (int) $service->service_state_type === 0): ?>
+                    <div><?= $this->translate('Soft', 'Soft state') ?> <?= $service->service_attempt ?></div>
+                <?php endif ?>
+                </div>
+            <?php endif ?>
+            </td>
+
+            <td>
+                <div class="state-header">
+                  <span class="service-on">
+                  <?= $this->iconImage()->service($service) ?>
+                  <?php
+                  if ($this->showHost) {
+                      echo sprintf(
+                          $this->translate('%s on %s', 'service on host'),
+                          $this->qlink(
+                              $service->service_display_name,
+                              $serviceLink,
+                              null,
+                              array(
+                                  'title' => sprintf(
+                                      $this->translate('Show detailed information for service %s on host %s'),
+                                      $service->service_display_name,
+                                      $service->host_display_name
+                                  ),
+                                  'class' => 'rowaction'
+                              )
+                          ),
+                              $this->qlink(
+                                  $service->host_display_name
+                                  . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''),
+                                  $hostLink,
+                                  null,
+                                  [
+                                      'title' => sprintf(
+                                          $this->translate('Show detailed information for host %s'),
+                                          $service->host_display_name
+                                      )
+                                  ]
+                              )
+                          );
+                  } else {
+                      echo $this->qlink(
+                          $service->service_display_name,
+                          $serviceLink,
+                          null,
+                          array(
+                              'title' => sprintf(
+                                  $this->translate('Show detailed information for service %s on host %s'),
+                                  $service->service_display_name,
+                                  $service->host_display_name
+                              ),
+                              'class' => 'rowaction'
+                          )
+                      );
+                  }
+                  ?>
+                  </span>
+                  <span class="state-icons"><?= $this->serviceFlags($service) ?></span>
+                </div>
+                <div class="overview-plugin-output-container">
+                    <div class="overview-performance-data">
+                        <?= $this->perfdata($service->service_perfdata, true, 5) ?>
+                    </div>
+                    <p class="overview-plugin-output"><?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true, $service->service_check_command) ?></p>
+                </div>
+            </td>
+        <?php foreach($this->addColumns as $col): ?>
+          <?php if ($service->$col && preg_match('~^_(host|service)_([a-zA-Z0-9_]+)$~', $col, $m)): ?>
+            <td><?= $this->escape(\Icinga\Module\Monitoring\Object\MonitoredObject::protectCustomVars([$m[2] => $service->$col])[$m[2]]) ?></td>
+          <?php else: ?>
+            <td><?= $this->escape($service->$col) ?></td>
+          <?php endif ?>
+        <?php endforeach ?>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($services->hasMore()): ?>
+<div class="dont-print action-links">
+    <?= $this->qlink(
+        $this->translate('Show More'),
+        $this->url()->without(array('showCompact', 'limit')),
+        null,
+        array(
+            'class'             => 'action-link',
+            'data-base-target'  => '_next'
+        )
+    ) ?>
+</div>
+<?php endif ?>
+</div>
+<?php if (! $this->compact): ?>
+<div class="monitoring-statusbar dont-print">
+    <?= $this->render('list/components/servicesummary.phtml') ?>
+    <?= $this->render('list/components/selectioninfo.phtml') ?>
+</div>
+<?php endif ?>