tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/deduplicate-puppet-code-6842

This commit is contained in:
Eric Lippmann 2014-12-15 12:37:10 +01:00
parent 575b6778f1 b307fe2791
commit 31a05c90a3
26 changed files with 322 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.puppet/profiles/icinga2_dev/files/conf.d/test-config.conf
View File

@ -47,7 +47,7 @@ object HostGroup "all-hosts" {
local host_types = ["ok", "random", "down", "up", "unreachable", "pending"]
__for (host_type in host_types) {
for (host_type in host_types) {
object HostGroup "all-" + host_type use (host_type) {
display_name = "All " + host_type + " hosts"
assign where host.vars.check_type == host_type
@ -57,7 +57,7 @@ __for (host_type in host_types) {
local service_types = ["ok", "warning", "critical", "unknown", "flapping", "pending"]
// Servicegroups
__for (service_type in service_types) {
for (service_type in service_types) {
object ServiceGroup "service-" + service_type use (service_type) {
display_name = "All " + service_type + " services"
assign where service.vars.check_type == service_type
@ -68,7 +68,7 @@ __for (service_type in service_types) {
// Services
// ---------------------------------------------------------------------------------------------------------------------
__function createService(service_type, num) {
function createService(service_type, num) {
apply Service "service-" + service_type + "-" + string(num + 1) use (service_type) {
import "generic-service"
@ -80,8 +80,8 @@ __function createService(service_type, num) {
}
}
__for (num in range(4)) {
__for (service_type in service_types) {
for (num in range(4)) {
for (service_type in service_types) {
createService(service_type, num)
}
}
@ -90,7 +90,7 @@ __for (num in range(4)) {
// Hosts
// ---------------------------------------------------------------------------------------------------------------------
__function createHost(checkType, checkConfig, num, checkEnabled) {
function createHost(checkType, checkConfig, num, checkEnabled) {
object Host "test-" + checkType + "-" + string(num + 1) use (checkEnabled, checkType, checkConfig) {
import "generic-host"
address = "127.0.0.1"
@ -101,7 +101,7 @@ __function createHost(checkType, checkConfig, num, checkEnabled) {
}
}
__for (num in range(10)) {
for (num in range(10)) {
createHost("ok", [ "ok" ], num, true)
createHost("random", [ "random", "flapping" ], num, true)
createHost("down", [ "warning", "critical" ], num, true)

60
application/views/helpers/Util.php
View File

@ -63,64 +63,4 @@ class Zend_View_Helper_Util extends Zend_View_Helper_Abstract
}
return date('H:i d.m.Y', $timestamp);
}
/**
* @deprecated Not used. This is monitoring module stuff.
*/
public static function getHostStateClassName($state)
{
$class = 'unknown';
switch ($state) {
case null:
$class = 'error';
break;
case 0:
$class = 'ok';
break;
case 1:
case 2:
$class = 'error';
break;
}
return $class;
}
/**
* @deprecated Crap. This is monitoring module stuff.
*/
public static function getHostStateName($state)
{
$states = array(
0 => 'UP',
1 => 'DOWN',
2 => 'UNREACHABLE',
3 => 'UNKNOWN',
4 => 'PENDING', // fake
99 => 'PENDING' // fake
);
if (isset($states[$state])) {
return $states[$state];
}
return sprintf('OUT OF BOUNDS (%s)', var_export($state, 1));
}
/**
* @deprecated Crap. This is monitoring module stuff.
*/
public static function getServiceStateName($state)
{
if ($state === null) { $state = 3; } // really?
$states = array(
0 => 'OK',
1 => 'WARNING',
2 => 'CRITICAL',
3 => 'UNKNOWN',
4 => 'PENDING', // fake
99 => 'PENDING' // fake
);
if (isset($states[$state])) {
return $states[$state];
}
return sprintf('OUT OF BOUND (%d)' . $state, (int) $state);
}
}

2
library/Icinga/Authentication/Backend/LdapUserBackend.php
View File

@ -150,7 +150,7 @@ class LdapUserBackend extends UserBackend
public function hasUser(User $user)
{
$username = $user->getUsername();
return $this->conn->fetchOne($this->selectUser($username)) === $username;
return strtolower($this->conn->fetchOne($this->selectUser($username))) === strtolower($username);
}
/**

10
modules/monitoring/application/controllers/HostController.php
View File

@ -4,6 +4,7 @@
use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
use Icinga\Module\Monitoring\Object\Host;
@ -76,4 +77,13 @@ class Monitoring_HostController extends MonitoredObjectController
$this->view->title = $this->translate('Schedule Host Downtime');
$this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
}
/**
* Submit a passive host check result
*/
public function processCheckResultAction()
{
$this->view->title = $this->translate('Submit Passive Host Check Result');
$this->handleCommandForm(new ProcessCheckResultCommandForm());
}
}

11
modules/monitoring/application/controllers/HostsController.php
View File

@ -7,6 +7,7 @@ use Icinga\Module\Monitoring\Controller;
use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
@ -103,6 +104,7 @@ class Monitoring_HostsController extends Controller
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
$this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/hosts/reschedule-check');
$this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/hosts/schedule-downtime');
$this->view->processCheckResultAllLink = Url::fromRequest()->setPath('monitoring/hosts/process-check-result');
$this->view->hostStates = $hostStates;
$this->view->objects = $this->hostList;
$this->view->unhandledObjects = $unhandledObjects;
@ -161,4 +163,13 @@ class Monitoring_HostsController extends Controller
$this->view->title = $this->translate('Schedule Host Downtimes');
$this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
}
/**
* Submit passive host check results
*/
public function processCheckResultAction()
{
$this->view->title = $this->translate('Submit Passive Host Check Results');
$this->handleCommandForm(new ProcessCheckResultCommandForm());
}
}

10
modules/monitoring/application/controllers/ServiceController.php
View File

@ -4,6 +4,7 @@
use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
use Icinga\Module\Monitoring\Object\Service;
@ -76,4 +77,13 @@ class Monitoring_ServiceController extends MonitoredObjectController
$this->view->title = $this->translate('Schedule Service Downtime');
$this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
}
/**
* Submit a passive service check result
*/
public function processCheckResultAction()
{
$this->view->title = $this->translate('Submit Passive Service Check Result');
$this->handleCommandForm(new ProcessCheckResultCommandForm());
}
}

13
modules/monitoring/application/controllers/ServicesController.php
View File

@ -7,6 +7,7 @@ use Icinga\Module\Monitoring\Controller;
use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
@ -117,6 +118,9 @@ class Monitoring_ServicesController extends Controller
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
$this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/services/reschedule-check');
$this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/services/schedule-downtime');
$this->view->processCheckResultAllLink = Url::fromRequest()->setPath(
'monitoring/services/process-check-result'
);
$this->view->hostStates = $hostStates;
$this->view->serviceStates = $serviceStates;
$this->view->objects = $this->serviceList;
@ -181,4 +185,13 @@ class Monitoring_ServicesController extends Controller
$this->view->title = $this->translate('Schedule Service Downtimes');
$this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
}
/**
* Submit passive service check results
*/
public function processCheckResultAction()
{
$this->view->title = $this->translate('Submit Passive Service Check Results');
$this->handleCommandForm(new ProcessCheckResultCommandForm());
}
}

123
modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php Normal file
View File

@ -0,0 +1,123 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Module\Monitoring\Forms\Command\Object;
use Icinga\Web\Notification;
use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand;
/**
* Form for submitting a passive host or service check result
*/
class ProcessCheckResultCommandForm extends ObjectsCommandForm
{
/**
* (non-PHPDoc)
* @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
*/
public function getSubmitLabel()
{
return mtp(
'monitoring', 'Submit Passive Check Result', 'Submit Passive Check Results', count($this->objects)
);
}
/**
* (non-PHPDoc)
* @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
*/
public function getHelp()
{
return mt(
'monitoring',
'This command is used to submit passive host or service check results.'
);
}
/**
* (non-PHPDoc)
* @see \Icinga\Web\Form::createElements() For the method documentation.
*/
public function createElements(array $formData)
{
foreach ($this->getObjects() as $object) {
/** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
// Nasty, but as getObjects() returns everything but an object with a real
// iterator interface this is the only way to fetch just the first element
break;
}
$this->addElement(
'select',
'status',
array(
'required' => true,
'label' => mt('monitoring', 'Status'),
'description' => mt('monitoring', 'The state this check result should report'),
'multiOptions' => $object->getType() === $object::TYPE_HOST ? array(
ProcessCheckResultCommand::HOST_UP => mt('monitoring', 'UP', 'icinga.state'),
ProcessCheckResultCommand::HOST_DOWN => mt('monitoring', 'DOWN', 'icinga.state'),
ProcessCheckResultCommand::HOST_UNREACHABLE => mt('monitoring', 'UNREACHABLE', 'icinga.state')
) : array(
ProcessCheckResultCommand::SERVICE_OK => mt('monitoring', 'OK', 'icinga.state'),
ProcessCheckResultCommand::SERVICE_WARNING => mt('monitoring', 'WARNING', 'icinga.state'),
ProcessCheckResultCommand::SERVICE_CRITICAL => mt('monitoring', 'CRITICAL', 'icinga.state'),
ProcessCheckResultCommand::SERVICE_UNKNOWN => mt('monitoring', 'UNKNOWN', 'icinga.state')
)
)
);
$this->addElement(
'text',
'output',
array(
'required' => true,
'label' => mt('monitoring', 'Output'),
'description' => mt('monitoring', 'The plugin output of this check result')
)
);
$this->addElement(
'text',
'perfdata',
array(
'allowEmpty' => true,
'label' => mt('monitoring', 'Performance Data'),
'description' => mt(
'monitoring',
'The performance data of this check result. Leave empty'
. ' if this check result has no performance data'
)
)
);
}
/**
* (non-PHPDoc)
* @see \Icinga\Web\Form::onSuccess() For the method documentation.
*/
public function onSuccess()
{
foreach ($this->objects as $object) {
/** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
$command = new ProcessCheckResultCommand();
$command->setObject($object);
$command->setStatus($this->getValue('status'));
$command->setOutput($this->getValue('output'));
if ($perfdata = $this->getValue('perfdata')) {
$command->setPerformanceData($perfdata);
}
$this->getTransport($this->request)->send($command);
}
Notification::success(mtp(
'monitoring',
'Processing check result..',
'Processing check results..',
count($this->objects)
));
return true;
}
}

2
modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
View File

@ -29,7 +29,7 @@ class LocalInstanceForm extends Form
array(
'required' => true,
'label' => mt('monitoring', 'Command File'),
'value' => '/usr/local/icinga/var/rw/icinga.cmd',
'value' => '/var/run/icinga2/cmd/icinga2.cmd',
'description' => mt('monitoring', 'Path to the local Icinga command file')
)
);

2
modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
View File

@ -63,7 +63,7 @@ class RemoteInstanceForm extends Form
array(
'required' => true,
'label' => mt('monitoring', 'Command File'),
'value' => '/usr/local/icinga/var/rw/icinga.cmd',
'value' => '/var/run/icinga2/cmd/icinga2.cmd',
'description' => mt('monitoring', 'Path to the Icinga command file on the remote Icinga instance')
)
)

9
modules/monitoring/application/views/helpers/MonitoringState.php
View File

@ -3,7 +3,7 @@
// {{{ICINGA_LICENSE_HEADER}}}
/**
* @deprecated Crap.
* @deprecated Most of these helpers are currently only used in the MultiController, which is probably obsolete
*/
class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
{
@ -11,7 +11,7 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
private $hoststates = array('up', 'down', 'unreachable', 99 => 'pending', null => 'pending');
/**
* @deprecated The host or service object must know it's possible states.
* @deprecated Not used anywhere.
*/
public function monitoringState($object, $type = 'service')
{
@ -22,6 +22,9 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
}
}
/**
* @deprecated Not used anywhere.
*/
public function monitoringStateById($id, $type = 'service')
{
if ($type === 'service') {
@ -91,7 +94,7 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
}
/**
* @deprecated Not translated.
* @deprecated Not used anywhere.
*/
public function getStateTitle($object, $type)
{

24
modules/monitoring/application/views/helpers/RuntimeVariables.php
View File

@ -27,12 +27,24 @@ class Zend_View_Helper_RuntimeVariables extends Zend_View_Helper_Abstract
public function create(stdClass $result)
{
$out = new stdClass();
$out->total_hosts = $result->total_hosts;
$out->total_scheduled_hosts = $result->total_scheduled_hosts;
$out->total_services = $result->total_services;
$out->total_scheduled_services = $result->total_scheduled_services;
$out->average_services_per_host = $result->total_services / $result->total_hosts;
$out->average_scheduled_services_per_host = $result->total_scheduled_services / $result->total_scheduled_hosts;
$out->total_hosts = isset($result->total_hosts)
? $result->total_hosts
: 0;
$out->total_scheduled_hosts = isset($result->total_scheduled_hosts)
? $result->total_scheduled_hosts
: 0;
$out->total_services = isset($result->total_services)
? $result->total_services
: 0;
$out->total_scheduled_services = isset($result->total_scheduled_services)
? $result->total_scheduled_services
: 0;
$out->average_services_per_host = $out->total_hosts > 0
? $out->total_services / $out->total_hosts
: 0;
$out->average_scheduled_services_per_host = $out->total_scheduled_hosts > 0
? $out->total_scheduled_services / $out->total_scheduled_hosts
: 0;
return $out;
}

7
modules/monitoring/application/views/scripts/hosts/show.phtml
View File

@ -47,6 +47,13 @@
</a>
</div>
<div>
<a href="<?= $processCheckResultAllLink; ?>">
<?= $this->icon('reply'); ?>
<?= $this->translate('Submit passive check results'); ?>
</a>
</div>
<?php if (! empty($unhandledObjects)): ?>
<h3>
<?= sprintf(

11
modules/monitoring/application/views/scripts/list/downtimes.phtml
View File

@ -1,3 +1,10 @@
<?php
use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service;
?>
<?php if (false === $this->compact): ?>
<div class="controls">
<?= $this->tabs->render($this); ?>
@ -24,9 +31,9 @@
<?php foreach ($downtimes as $downtime): ?>
<?php
if (isset($downtime->service)) {
$stateName = strtolower($this->util()->getServiceStateName($downtime->service_state));
$stateName = Service::getStateText($downtime->service_state);
} else {
$stateName = strtolower($this->util()->getHostStateName($downtime->host_state));
$stateName = Host::getStateText($downtime->host_state);
}
?>
<tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">

23
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -1,3 +1,10 @@
<?php
use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service;
?>
<?php if (false === $this->compact): ?>
<div class="controls">
<?= $this->tabs ?>
@ -62,22 +69,22 @@
case 'hard_state':
$icon = $isService ? 'service' : 'host';
$msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $event->output;
$stateName = (
$stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
$title = strtoupper(
$isService
? strtolower($this->util()->getServiceStateName($event->state))
: strtolower($this->util()->getHostStateName($event->state))
? Service::getStateText($event->state, true)
: Host::getStateText($event->state, true)
);
$title = strtoupper($stateName); // TODO: Should be translatable!
break;
case 'soft_state':
$icon = 'lightbulb';
$msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $event->output;
$stateName = (
$stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
$title = strtoupper(
$isService
? strtolower($this->util()->getServiceStateName($event->state))
: strtolower($this->util()->getHostStateName($event->state))
? Service::getStateText($event->state, true)
: Host::getStateText($event->state, true)
);
$title = strtoupper($stateName); // TODO: Should be translatable!
break;
case 'dt_start':
$icon = 'starttime';

8
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -1,4 +1,6 @@
<?php
use Icinga\Module\Monitoring\Object\Host;
$helper = $this->getHelper('MonitoringState');
if ($this->compact): ?>
@ -41,7 +43,7 @@ if ($hosts->count() === 0) {
<tbody>
<?php foreach($hosts as $host):
$hostStateName = strtolower($this->util()->getHostStateName($host->host_state));
$hostStateName = Host::getStateText($host->host_state);
$hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
$icons = array();
@ -79,8 +81,8 @@ if ($hosts->count() === 0) {
?>
<tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
<!-- State -->
<td class="state" title="<?= $helper->getStateTitle($host, 'host') ?>">
<strong><?= ucfirst($helper->monitoringState($host, 'host')) ?></strong><br />
<td class="state">
<strong><?= strtoupper(Host::getStateText($host->host_state, true)); ?></strong><br />
<?php if ((int) $host->host_state !== 99): ?>
<?= $this->prefixedTimeSince($host->host_last_state_change, true) ?>
<?php if ($host->host_state > 0 && (int) $host->host_state_type === 0): ?>

11
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -1,3 +1,10 @@
<?php
use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service;
?>
<?php if (!$this->compact): ?>
<div class="controls">
<?= $this->tabs ?>
@ -36,13 +43,13 @@ foreach ($notifications as $notification):
'host' => $notification->host,
'service' => $notification->service
));
$stateName = strtolower($this->util()->getServiceStateName($notification->notification_state));
$stateName = Service::getStateText($notification->notification_state);
} else {
$isService = false;
$href = $this->href('monitoring/show/host', array(
'host' => $notification->host
));
$stateName = strtolower($this->util()->getHostStateName($notification->notification_state));
$stateName = Host::getStateText($notification->notification_state);
}
?>
<tr class="state <?= $stateName ?>">

7
modules/monitoring/application/views/scripts/list/servicegrid.phtml
View File

@ -1,3 +1,8 @@
<?php
use Icinga\Module\Monitoring\Object\Service;
?>
<?php if (!$this->compact): ?>
<div class="controls">
<?= $this->tabs; ?>
@ -63,7 +68,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
<a href="<?= $this->href('monitoring/show/service', array(
'host' => $service->host_name,
'service' => $service->service_description
)); ?>" title="<?= $this->escape($service->service_output); ?>" class="state_<?= $this->monitoringState($service, 'service'); ?> <?= $service->service_handled ? 'handled' : ''; ?>"></a>
)); ?>" title="<?= $this->escape($service->service_output); ?>" class="state_<?= Service::getStateText($service->service_state); ?> <?= $service->service_handled ? 'handled' : ''; ?>"></a>
</td>
<?php else: ?>
<td>&middot;</td>

12
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -1,4 +1,7 @@
<?php
use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service;
$helper = $this->getHelper('MonitoringState');
$selfUrl = 'monitoring/list/services';
@ -51,12 +54,11 @@ foreach ($services as $service):
'host' => $service->host_name,
)
);
$serviceStateName = strtolower($this->util()->getServiceStateName($service->service_state));
$serviceStateName = Service::getStateText($service->service_state);
?>
<tr class="state <?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
<td class="state" title="<?= $helper->getStateTitle($service, 'service'); ?>">
<strong><?= $this->translate(strtoupper($helper->monitoringState($service, 'service'))) ?></strong><br />
<td class="state">
<strong><?= strtoupper(Service::getStateText($service->service_state, true)); ?></strong><br />
<?php if (!$this->compact): ?><?= $this->prefixedTimeSince($service->service_last_state_change); ?><?php else: ?><?= $this->timeSince($service->service_last_state_change); ?><?php endif ?>
<?php if ($service->service_state > 0 && (int) $service->service_state_type === 0): ?>
<br />
@ -106,7 +108,7 @@ foreach ($services as $service):
<?php endif ?>
<a href="<?= $serviceLink ?>"><?= $service->service_display_name ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $service->host_name; ?>
<?php if ($service->host_state != 0): ?>
(<?= ucfirst($helper->monitoringState($service, 'host')); ?>)
(<?= strtoupper(Host::getStateText($service->host_state, true)); ?>)
<?php endif ?>
</a><?php endif ?><br />
<p class="pluginoutput"><?= $this->escape(substr(strip_tags($service->service_output), 0, 10000)); ?></p>

7
modules/monitoring/application/views/scripts/services/show.phtml
View File

@ -59,6 +59,13 @@
</a>
</div>
<div>
<a href="<?= $processCheckResultAllLink; ?>">
<?= $this->icon('reply'); ?>
<?= $this->translate('Submit passive check results'); ?>
</a>
</div>
<?php if (! empty($unhandledObjects)): ?>
<h3>
<?= sprintf(

16
modules/monitoring/application/views/scripts/show/components/command.phtml
View File

@ -5,7 +5,21 @@ $command = array_shift($parts);
?><tr class="newsection">
<th><?= $this->translate('Command') ?></th>
<td><?= $this->escape($command) ?>
<td>
<?= $this->escape($command) ?>
<?php if ($object->passive_checks_enabled): ?>
<?php if ($object->getType() === $object::TYPE_HOST): ?>
<a href="<?= $this->href(
'monitoring/host/process-check-result',
array('host' => $object->getName())
); ?>"><?= $this->icon('reply'); ?> <?= $this->translate('Process check result'); ?></a>
<?php else: ?>
<a href="<?= $this->href(
'monitoring/service/process-check-result',
array('host' => $object->getHost()->getName(), 'service' => $object->getName())
); ?>"><?= $this->icon('reply'); ?> <?= $this->translate('Process check result'); ?></a>
<?php endif ?>
<?php endif ?>
</tr>
<?php

17
modules/monitoring/application/views/scripts/show/components/header.phtml
View File

@ -1,11 +1,18 @@
<?php $showService = $object->getType() === $object::TYPE_SERVICE ?>
<?php
use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service;
$showService = $object->getType() === $object::TYPE_SERVICE;
?>
<?php if (!$this->compact): ?>
<?= $tabs ?>
<?php endif ?>
<table class="objectstate">
<tr class="state <?= $this->monitoringState($object, 'host') ?><?= $object->host_handled ? ' handled' : '' ?>">
<tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : '' ?>">
<td class="state"<?= $showService ? '' : ' rowspan="2"' ?>>
<strong><?= $this->translate($this->util()->getHostStateName($object->host_state)) ?></strong><br />
<strong><?= strtoupper(Host::getStateText($object->host_state, true)); ?></strong><br />
<?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
</td>
<td><b><?= $this->escape($object->host_name) ?></b><?php
@ -15,9 +22,9 @@
</td>
</tr>
<?php if ($showService): ?>
<tr class="state <?= $this->monitoringState($object, 'service') ?><?= $object->service_handled ? ' handled' : '' ?>">
<tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
<td class="state">
<strong><?= $this->translate($this->util()->getServiceStateName($object->service_state)) ?></strong><br />
<strong><?= strtoupper(Service::getStateText($object->service_state, true)); ?></strong><br />
<?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>
</td>
<td><b><?= $this->translate('Service') ?>: <?= $this->escape($object->service_description) ?></b>

42
modules/monitoring/application/views/scripts/show/history.phtml
View File

@ -1,3 +1,10 @@
<?php
use Icinga\Module\Monitoring\Object\Host;
use Icinga\Module\Monitoring\Object\Service;
?>
<div class="controls">
<?= $this->render('show/components/header.phtml'); ?>
<h1><?= $this->translate('This Object\'s Event History'); ?></h1>
@ -13,6 +20,7 @@
<?php
$self = $this;
$hostContext = $object->getType() === 'host';
function contactsLink($match, $view) {
$links = array();
foreach (preg_split('/,\s/', $match[1]) as $contact) {
@ -32,11 +40,7 @@ function contactsLink($match, $view) {
case 'notify':
$icon = 'notification';
$title = $this->translate('Notification');
$stateClass = (
$isService
? strtolower($this->util()->getServiceStateName($event->state))
: strtolower($this->util()->getHostStateName($event->state))
);
$stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
$msg = preg_replace_callback(
'/^\[([^\]]+)\]/',
@ -86,23 +90,23 @@ function contactsLink($match, $view) {
break;
case 'hard_state':
$msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
$stateClass = (
$isService
? strtolower($this->util()->getServiceStateName($event->state))
: strtolower($this->util()->getHostStateName($event->state))
);
$stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
$icon = 'attention-alt';
$title = strtoupper($stateClass); // TODO: Should be translatable!
$title = strtoupper(
$isService
? Service::getStateText($event->state)
: Host::getStateText($event->state)
);
break;
case 'soft_state':
$icon = 'spinner';
$msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
$stateClass = (
$stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
$title = strtoupper(
$isService
? strtolower($this->util()->getServiceStateName($event->state))
: strtolower($this->util()->getHostStateName($event->state))
? Service::getStateText($event->state)
: Host::getStateText($event->state)
);
$title = strtoupper($stateClass); // TODO: Should be translatable!
break;
case 'dt_start':
$icon = 'downtime_start';
@ -132,7 +136,13 @@ $output = $this->tickets ? preg_replace_callback(
?>
<?php if ($isService): ?>
<?= $this->escape($event->service_description) . ' ' . $this->translate('on') . ' ' . $this->escape($event->host_name); ?>
<?= $hostContext ? $this->qlink(
$this->escape($event->service_description),
'monitoring/show/service',
array(
'host' => $event->host_name,
'service' => $event->service_description)
) : $this->escape($event->service_description); ?> <?= $this->translate('on') . ' ' . $this->escape($event->host_name); ?>
<?php else: ?>
<?= $this->escape($event->host_name); ?>
<?php endif ?>

2
modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
View File

@ -34,7 +34,7 @@ class ProcessCheckResultCommand extends ObjectCommand
/**
* Host unreachable
*/
const HOST_UNREACHABLE = 2;
const HOST_UNREACHABLE = 2; // TODO: Icinga 2.x does not support submitting results with this state, yet
/**
* Service ok

2
modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
View File

@ -126,7 +126,7 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
} else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf(
'PROCESS_SVC_CHECK_RESULT;%s;%s',
'PROCESS_SERVICE_CHECK_RESULT;%s;%s',
$object->getHost()->getName(),
$object->getName()
);

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

@ -194,7 +194,7 @@ tr.state.handled td.state {
}
/* HOVER colors */
tr[href]:hover {
tr.state:hover, tr[href]:hover {
color: black;
background-color: #eee;
}