tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-design host- and servicegroupsummary

Browse Source
This commit is contained in:
Johannes Meyer 2014-11-20 12:44:46 +01:00
parent 38957e340b
commit 86485cb8ef
3 changed files with 83 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/monitoring/application/views/scripts/list/hostgroups.phtml
View File

@ -21,46 +21,46 @@
?> ?>
<table class="groupview" data-base-target="_next"> <table class="groupview" data-base-target="_next">
<thead> <thead>
<th style="text-align: left;"><?= $this->translate('Last Problem'); ?></th> <th><?= $this->translate('Last Problem'); ?></th>
<th style="text-align: left;"><?= $this->translate('Host Group'); ?></th> <th><?= $this->translate('Host Group'); ?></th>
<th><?= $this->translate('Total Services'); ?></th> <th><?= $this->translate('Total Services'); ?></th>
<th colspan="5"><?= $this->translate('Service States'); ?></th> <th><?= $this->translate('Service States'); ?></th>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($hostgroups as $h): ?> <?php foreach ($hostgroups as $h): ?>
<tr href="<?= $this->href('monitoring/list/services', array('hostgroup' => $h->hostgroup)); ?>"> <tr href="<?= $this->href('monitoring/list/services', array('hostgroup' => $h->hostgroup)); ?>">
<?php if ($h->services_critical_last_state_change_unhandled): ?> <?php if ($h->services_critical_last_state_change_unhandled): ?>
<td class="state change critical"> <td class="state change critical unhandled">
<strong><?= $this->translate('CRITICAL'); ?></strong> <strong><?= $this->translate('CRITICAL'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($h->services_critical_last_state_change_unhandled); ?> <?= $this->prefixedTimeSince($h->services_critical_last_state_change_unhandled); ?>
</td> </td>
<?php elseif ($h->services_unknown_last_state_change_unhandled): ?> <?php elseif ($h->services_unknown_last_state_change_unhandled): ?>
<td class="state change unknown"> <td class="state change unknown unhandled">
<strong><?= $this->translate('UNKNOWN'); ?></strong> <strong><?= $this->translate('UNKNOWN'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($h->services_unknown_last_state_change_unhandled); ?> <?= $this->prefixedTimeSince($h->services_unknown_last_state_change_unhandled); ?>
</td> </td>
<?php elseif ($h->services_warning_last_state_change_unhandled): ?> <?php elseif ($h->services_warning_last_state_change_unhandled): ?>
<td class="state change warning"> <td class="state change warning unhandled">
<strong><?= $this->translate('WARNING'); ?></strong> <strong><?= $this->translate('WARNING'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($h->services_warning_last_state_change_unhandled); ?> <?= $this->prefixedTimeSince($h->services_warning_last_state_change_unhandled); ?>
</td> </td>
<?php elseif ($h->services_critical_last_state_change_handled): ?> <?php elseif ($h->services_critical_last_state_change_handled): ?>
<td class="state change critical handled"> <td class="state change critical">
<strong><?= $this->translate('CRITICAL'); ?></strong> <strong><?= $this->translate('CRITICAL'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($h->services_critical_last_state_change_handled); ?> <?= $this->prefixedTimeSince($h->services_critical_last_state_change_handled); ?>
</td> </td>
<?php elseif ($h->services_unknown_last_state_change_handled): ?> <?php elseif ($h->services_unknown_last_state_change_handled): ?>
<td class="state change unknown handled"> <td class="state change unknown">
<strong><?= $this->translate('UNKNOWN'); ?></strong> <strong><?= $this->translate('UNKNOWN'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($h->services_unknown_last_state_change_handled); ?> <?= $this->prefixedTimeSince($h->services_unknown_last_state_change_handled); ?>
</td> </td>
<?php elseif ($h->services_warning_last_state_change_handled): ?> <?php elseif ($h->services_warning_last_state_change_handled): ?>
<td class="state change warning handled"> <td class="state change warning">
<strong><?= $this->translate('WARNING'); ?></strong> <strong><?= $this->translate('WARNING'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($h->services_warning_last_state_change_handled); ?> <?= $this->prefixedTimeSince($h->services_warning_last_state_change_handled); ?>
@ -78,12 +78,12 @@
<?= $this->prefixedTimeSince($h->services_pending_last_state_change); ?> <?= $this->prefixedTimeSince($h->services_pending_last_state_change); ?>
</td> </td>
<?php endif ?> <?php endif ?>
<td> <td class="groupname">
<a href="<?= $this->href('monitoring/list/services', array('hostgroup' => $h->hostgroup)); ?>"> <a href="<?= $this->href('monitoring/list/services', array('hostgroup' => $h->hostgroup)); ?>">
<?= $h->hostgroup; ?> <?= $h->hostgroup; ?>
</a> </a>
</td> </td>
<td class="services-total"> <td class="total">
<?= $h->services_total; ?> <?= $h->services_total; ?>
</td> </td>
<td class="state"> <td class="state">
@ -100,13 +100,7 @@
<?= $h->services_ok; ?> <?= $h->services_ok; ?>
</a> </a>
</span> </span>
<?php else: ?>
<span class="no-state">
-
</span>
<?php endif ?> <?php endif ?>
</td>
<td class="state">
<?php if ($h->services_critical_unhandled): ?> <?php if ($h->services_critical_unhandled): ?>
<span class="state critical"> <span class="state critical">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -141,13 +135,6 @@
<?php if ($h->services_critical_unhandled): ?> <?php if ($h->services_critical_unhandled): ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! $h->services_critical_unhandled && !$h->services_critical_handled): ?>
<span class="no-state">
-
</span>
<?php endif ?>
</td>
<td class="state">
<?php if ($h->services_unknown_unhandled): ?> <?php if ($h->services_unknown_unhandled): ?>
<span class="state unknown"> <span class="state unknown">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -182,13 +169,6 @@
<?php if ($h->services_unknown_unhandled): ?> <?php if ($h->services_unknown_unhandled): ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! $h->services_unknown_unhandled && !$h->services_unknown_handled): ?>
<span class="no-state">
-
</span>
<?php endif ?>
</td>
<td class="state">
<?php if ($h->services_warning_unhandled): ?> <?php if ($h->services_warning_unhandled): ?>
<span class="state warning"> <span class="state warning">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -223,13 +203,6 @@
<?php if ($h->services_warning_unhandled): ?> <?php if ($h->services_warning_unhandled): ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! $h->services_warning_unhandled && !$h->services_warning_handled): ?>
<span class="no-state">
-
</span>
<?php endif ?>
</td>
<td class="state">
<?php if ($h->services_pending): ?> <?php if ($h->services_pending): ?>
<span class="state pending"> <span class="state pending">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -243,10 +216,6 @@
<?= $h->services_pending; ?> <?= $h->services_pending; ?>
</a> </a>
</span> </span>
<?php else: ?>
<span class="no-state">
-
</span>
<?php endif ?> <?php endif ?>
</td> </td>
</tr> </tr>

53
modules/monitoring/application/views/scripts/list/servicegroups.phtml
View File

@ -21,46 +21,46 @@
?> ?>
<table class="groupview" data-base-target="_next"> <table class="groupview" data-base-target="_next">
<thead> <thead>
<th style="text-align: left;"><?= $this->translate('Last Problem'); ?></th> <th><?= $this->translate('Last Problem'); ?></th>
<th style="text-align: left;"><?= $this->translate('Service Group'); ?></th> <th><?= $this->translate('Service Group'); ?></th>
<th><?= $this->translate('Total Services'); ?></th> <th><?= $this->translate('Total Services'); ?></th>
<th colspan="5"><?= $this->translate('Service States'); ?></th> <th><?= $this->translate('Service States'); ?></th>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($servicegroups as $s): ?> <?php foreach ($servicegroups as $s): ?>
<tr href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>"> <tr href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>">
<?php if ($s->services_critical_last_state_change_unhandled): ?> <?php if ($s->services_critical_last_state_change_unhandled): ?>
<td class="state change critical"> <td class="state change critical unhandled">
<strong><?= $this->translate('CRITICAL'); ?></strong> <strong><?= $this->translate('CRITICAL'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($s->services_critical_last_state_change_unhandled); ?> <?= $this->prefixedTimeSince($s->services_critical_last_state_change_unhandled); ?>
</td> </td>
<?php elseif ($s->services_unknown_last_state_change_unhandled): ?> <?php elseif ($s->services_unknown_last_state_change_unhandled): ?>
<td class="state change unknown"> <td class="state change unknown unhandled">
<strong><?= $this->translate('UNKNOWN'); ?></strong> <strong><?= $this->translate('UNKNOWN'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($s->services_unknown_last_state_change_unhandled); ?> <?= $this->prefixedTimeSince($s->services_unknown_last_state_change_unhandled); ?>
</td> </td>
<?php elseif ($s->services_warning_last_state_change_unhandled): ?> <?php elseif ($s->services_warning_last_state_change_unhandled): ?>
<td class="state change warning"> <td class="state change warning unhandled">
<strong><?= $this->translate('WARNING'); ?></strong> <strong><?= $this->translate('WARNING'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($s->services_warning_last_state_change_unhandled); ?> <?= $this->prefixedTimeSince($s->services_warning_last_state_change_unhandled); ?>
</td> </td>
<?php elseif ($s->services_critical_last_state_change_handled): ?> <?php elseif ($s->services_critical_last_state_change_handled): ?>
<td class="state change critical handled"> <td class="state change critical">
<strong><?= $this->translate('CRITICAL'); ?></strong> <strong><?= $this->translate('CRITICAL'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($s->services_critical_last_state_change_handled); ?> <?= $this->prefixedTimeSince($s->services_critical_last_state_change_handled); ?>
</td> </td>
<?php elseif ($s->services_unknown_last_state_change_handled): ?> <?php elseif ($s->services_unknown_last_state_change_handled): ?>
<td class="state change unknown handled"> <td class="state change unknown">
<strong><?= $this->translate('UNKNOWN'); ?></strong> <strong><?= $this->translate('UNKNOWN'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($s->services_unknown_last_state_change_handled); ?> <?= $this->prefixedTimeSince($s->services_unknown_last_state_change_handled); ?>
</td> </td>
<?php elseif ($s->services_warning_last_state_change_handled): ?> <?php elseif ($s->services_warning_last_state_change_handled): ?>
<td class="state change warning handled"> <td class="state change warning">
<strong><?= $this->translate('WARNING'); ?></strong> <strong><?= $this->translate('WARNING'); ?></strong>
<br> <br>
<?= $this->prefixedTimeSince($s->services_warning_last_state_change_handled); ?> <?= $this->prefixedTimeSince($s->services_warning_last_state_change_handled); ?>
@ -78,12 +78,12 @@
<?= $this->prefixedTimeSince($s->services_pending_last_state_change); ?> <?= $this->prefixedTimeSince($s->services_pending_last_state_change); ?>
</td> </td>
<?php endif ?> <?php endif ?>
<td> <td class="groupname">
<a href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>"> <a href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>">
<?= $s->servicegroup; ?> <?= $s->servicegroup; ?>
</a> </a>
</td> </td>
<td class="services-total"> <td class="total">
<?= $s->services_total; ?> <?= $s->services_total; ?>
</td> </td>
<td class="state"> <td class="state">
@ -100,13 +100,7 @@
<?= $s->services_ok; ?> <?= $s->services_ok; ?>
</a> </a>
</span> </span>
<?php else: ?>
<span class="no-state">
-
</span>
<?php endif ?> <?php endif ?>
</td>
<td class="state">
<?php if ($s->services_critical_unhandled): ?> <?php if ($s->services_critical_unhandled): ?>
<span class="state critical"> <span class="state critical">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -141,13 +135,6 @@
<?php if ($s->services_critical_unhandled): ?> <?php if ($s->services_critical_unhandled): ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! $s->services_critical_unhandled && !$s->services_critical_handled): ?>
<span class="no-state">
-
</span>
<?php endif ?>
</td>
<td class="state">
<?php if ($s->services_unknown_unhandled): ?> <?php if ($s->services_unknown_unhandled): ?>
<span class="state unknown"> <span class="state unknown">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -182,13 +169,6 @@
<?php if ($s->services_unknown_unhandled): ?> <?php if ($s->services_unknown_unhandled): ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! $s->services_unknown_unhandled && !$s->services_unknown_handled): ?>
<span class="no-state">
-
</span>
<?php endif ?>
</td>
<td class="state">
<?php if ($s->services_warning_unhandled): ?> <?php if ($s->services_warning_unhandled): ?>
<span class="state warning"> <span class="state warning">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -223,13 +203,6 @@
<?php if ($s->services_warning_unhandled): ?> <?php if ($s->services_warning_unhandled): ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?php if (! $s->services_warning_unhandled && !$s->services_warning_handled): ?>
<span class="no-state">
-
</span>
<?php endif ?>
</td>
<td class="state">
<?php if ($s->services_pending): ?> <?php if ($s->services_pending): ?>
<span class="state pending"> <span class="state pending">
<a href="<?= $this->href( <a href="<?= $this->href(
@ -243,10 +216,6 @@
<?= $s->services_pending; ?> <?= $s->services_pending; ?>
</a> </a>
</span> </span>
<?php else: ?>
<span class="no-state">
-
</span>
<?php endif ?> <?php endif ?>
</td> </td>
</tr> </tr>

134
public/css/icinga/monitoring-colors.less
View File

@ -829,18 +829,18 @@ table.groupview {
border-collapse: separate; border-collapse: separate;
border-spacing: 0.1em; border-spacing: 0.1em;
thead th { th {
font-size: 0.9em; font-size: 0.9em;
text-align: left;
white-space: nowrap;
} }
tbody { td {
tr { &.groupname {
&:hover { width: 60%;
color: #333;
}
a { a {
color: #333; color: inherit;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -849,19 +849,19 @@ table.groupview {
} }
} }
td.services-total { &.total {
width: 10%; width: 10%;
text-align: center;
} }
td.state { &.state {
width: 10%; width: 20%;
color: white; white-space: nowrap;
text-align: center;
&.change { &.change {
width: 10%; width: 10%;
white-space: nowrap; text-align: center;
border-left-width: 1.5em;
border-left-style: solid;
padding: 0.3em 0.5em 0.3em 0.5em; padding: 0.3em 0.5em 0.3em 0.5em;
strong { strong {
@ -871,70 +871,58 @@ table.groupview {
span.timesince { span.timesince {
font-size: 0.8em; font-size: 0.8em;
} }
}
&.ok {
border-color: @colorOk;
}
&.ok { &.pending {
color: #333; border-color: @colorPending;
border-left-style: solid; }
border-left-width: 1.5em;
border-color: @colorOk;
}
&.pending { &.warning {
color: #333;
border-left-style: solid;
border-left-width: 1.5em;
border-color: @colorPending;
}
&.warning {
background-color: @colorWarning;
&.handled {
background-color: inherit;
color: #333;
border-left-style: solid;
border-left-width: 1.5em;
border-color: @colorWarningHandled; border-color: @colorWarningHandled;
}
}
&.unknown { &.unhandled {
background-color: @colorUnknown;
&.handled {
color: #333;
background-color: inherit;
border-left-style: solid;
border-left-width: 1.5em;
border-color: @colorUnknownHandled;
}
}
&.critical {
background-color: @colorCritical;
&.handled {
color: #333;
background-color: inherit;
border-left-style: solid;
border-left-width: 1.5em;
border-color: @colorCriticalHandled;
}
}
span {
&.no-state {
color: #333;
}
&.state {
&.handled {
margin-right: 2px;
}
a {
color: white; color: white;
border-left-width: 0;
background-color: @colorWarning;
}
}
&.unknown {
border-color: @colorUnknownHandled;
&.unhandled {
color: white;
border-left-width: 0;
background-color: @colorUnknown;
}
}
&.critical {
border-color: @colorCriticalHandled;
&.unhandled {
color: white;
border-left-width: 0;
background-color: @colorCritical;
}
}
}
span.state {
&.handled {
margin-right: 2px;
}
a {
font-size: 0.9em;
color: white;
text-decoration: none;
&:hover {
text-decoration: underline;
} }
} }
} }