monitoring: Reduce header size for multiple selected services
refs #5543
This commit is contained in:
Eric Lippmann
parent
848882bb44
commit
818105bc45
|
|
@ -53,28 +53,20 @@ class ServicesController extends Controller
|
|||
protected function handleCommandForm(ObjectsCommandForm $form)
|
||||
{
|
||||
$this->serviceList->setColumns(array(
|
||||
'host_icon_image',
|
||||
'host_icon_image_alt',
|
||||
'host_display_name',
|
||||
'host_name',
|
||||
'host_address',
|
||||
'host_address6',
|
||||
'host_output',
|
||||
'host_state',
|
||||
'host_problem',
|
||||
'host_handled',
|
||||
'service_icon_image',
|
||||
'service_icon_image_alt',
|
||||
'service_description',
|
||||
'service_state',
|
||||
'service_problem',
|
||||
'service_handled',
|
||||
'service_acknowledged',
|
||||
'service_active_checks_enabled',
|
||||
'service_description',
|
||||
'service_display_name',
|
||||
'service_handled',
|
||||
'service_in_downtime',
|
||||
'service_is_flapping',
|
||||
'service_output',
|
||||
'service_last_state_change',
|
||||
'service_notifications_enabled',
|
||||
'service_active_checks_enabled',
|
||||
'service_passive_checks_enabled'
|
||||
'service_passive_checks_enabled',
|
||||
'service_state'
|
||||
));
|
||||
|
||||
$form
|
||||
|
|
@ -99,32 +91,22 @@ class ServicesController extends Controller
|
|||
->handleRequest();
|
||||
$this->view->checkNowForm = $checkNowForm;
|
||||
$this->serviceList->setColumns(array(
|
||||
'host_icon_image',
|
||||
'host_icon_image_alt',
|
||||
'host_display_name',
|
||||
'host_name',
|
||||
'host_address',
|
||||
'host_address6',
|
||||
'host_output',
|
||||
'host_state',
|
||||
'host_problem',
|
||||
'host_handled',
|
||||
'service_icon_image',
|
||||
'service_icon_image_alt',
|
||||
'service_output',
|
||||
'service_description',
|
||||
'service_state',
|
||||
'service_problem',
|
||||
'service_handled',
|
||||
'host_state',
|
||||
'service_acknowledged',
|
||||
'service_active_checks_enabled',
|
||||
'service_description',
|
||||
'service_display_name',
|
||||
'service_handled',
|
||||
'service_in_downtime',
|
||||
'service_is_flapping',
|
||||
'service_last_state_change',
|
||||
'service_notifications_enabled',
|
||||
'service_active_checks_enabled',
|
||||
'service_passive_checks_enabled'
|
||||
/*
|
||||
'service_event_handler_enabled',
|
||||
'service_flap_detection_enabled',
|
||||
'service_obsessing'*/
|
||||
'service_passive_checks_enabled',
|
||||
'service_problem',
|
||||
'service_state'
|
||||
));
|
||||
|
||||
$acknowledgedObjects = $this->serviceList->getAcknowledgedObjects();
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
|
|||
public function service($service, $serviceLinkText, $host, $hostLinkText, $class = null)
|
||||
{
|
||||
return sprintf(
|
||||
'%s: %s',
|
||||
'%s: %s',
|
||||
$this->host($host, $hostLinkText),
|
||||
$this->view->qlink(
|
||||
$serviceLinkText,
|
||||
|
|
|
|||
|
|
@ -1,46 +1,45 @@
|
|||
<?php
|
||||
use Icinga\Module\Monitoring\Object\Host;
|
||||
use Icinga\Module\Monitoring\Object\Service;
|
||||
|
||||
$i = 0;
|
||||
?>
|
||||
<?php if (($serviceCount = count($objects)) > 0): ?>
|
||||
<table class='action state statesummary'>
|
||||
<tbody>
|
||||
<?php foreach ($objects as $service): /** @var Service $service */ ?>
|
||||
<?php
|
||||
if (++ $i > 5) {
|
||||
continue;
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td class="state-col state-<?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>"?>
|
||||
<?= Service::getStateText($service->service_state, true); ?><br />
|
||||
</td>
|
||||
<td>
|
||||
<?= $this->iconImage()->service($service) ?>
|
||||
if (! ($serviceCount = count($objects))): return; endif ?>
|
||||
<table class="state-table">
|
||||
<tbody>
|
||||
<?php foreach ($objects as $i => $service): /** @var Service $service */
|
||||
if ($i === 5) {
|
||||
break;
|
||||
} ?>
|
||||
<tr>
|
||||
<td class="state-col state-<?= Service::getStateText($service->service_state) ?><?= $service->service_handled ? ' handled' : '' ?>">
|
||||
<span class="sr-only"><?= Service::getStateText($service->service_state) ?></span>
|
||||
<div class="state-meta">
|
||||
<?= $this->timeSince($service->service_last_state_change, $this->compact) ?>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<?= $this->link()->service(
|
||||
$service->service_description,
|
||||
$service->service_display_name,
|
||||
$service->host_name,
|
||||
$service->host_display_name
|
||||
. ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : '')
|
||||
) ?>
|
||||
<?= implode(' ', $this->serviceFlags($service)) ?>
|
||||
<b>
|
||||
<?= $this->escape($service->getHost()->getName()); ?>:
|
||||
<?= $this->escape($service->getName()); ?> <br>
|
||||
</b>
|
||||
<?= $this->escape($service->service_output) ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach ?>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="hbox-item multi-commands">
|
||||
<?php if ($i > 5): ?>
|
||||
<?= $this->qlink(
|
||||
sprintf($this->translate('List all %d services'), $i),
|
||||
$listAllLink,
|
||||
null,
|
||||
array(
|
||||
'icon' => 'down-open',
|
||||
'data-base-target' => '_next'
|
||||
)
|
||||
);
|
||||
?>
|
||||
<?php endif ?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach ?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if ($serviceCount > 5): ?>
|
||||
<div class="services-link">
|
||||
<?= $this->qlink(
|
||||
sprintf($this->translate('List all %d services'), $serviceCount),
|
||||
$this->url()->setPath('monitoring/list/services'),
|
||||
null,
|
||||
array(
|
||||
'data-base-target' => '_next',
|
||||
'icon' => 'forward'
|
||||
)
|
||||
) ?>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue