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

Add check source to host/service details 

refs #5814
This commit is contained in:
Michael Friedrich 2014-05-20 20:07:09 +02:00
parent 4a2074f250
commit 9fbdb65a4b
8 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/monitoring/application/views/helpers/CheckSource.php Normal file
View File

@ -0,0 +1,14 @@
<?php
class Zend_View_Helper_CheckSource extends Zend_View_Helper_Abstract
{
protected static $purifier;
public function checkSource($source)
{
if (empty($source)) {
return '';
}
return $this->view->escape($source);
}
}

7
modules/monitoring/application/views/scripts/show/components/checksource.phtml Normal file
View File

@ -0,0 +1,7 @@
<?php if (! $object->check_source) return ?>
<tr>
<th><?= $this->translate('Check Source') ?></th>
<td>
<?= $this->checkSource($object->check_source) ?>
</td>
</tr>

1
modules/monitoring/application/views/scripts/show/host.phtml
View File

@ -13,6 +13,7 @@
<?= $this->render('show/components/downtime.phtml') ?>
<?= $this->render('show/components/flapping.phtml') ?>
<?= $this->render('show/components/perfdata.phtml') ?>
<?= $this->render('show/components/checksource.phtml') ?>
<?= $this->render('show/components/actions.phtml') ?>
<?= $this->render('show/components/command.phtml') ?>
<?= $this->render('show/components/hostgroups.phtml') ?>

1
modules/monitoring/application/views/scripts/show/service.phtml
View File

@ -13,6 +13,7 @@
<?= $this->render('show/components/downtime.phtml') ?>
<?= $this->render('show/components/flapping.phtml') ?>
<?= $this->render('show/components/perfdata.phtml') ?>
<?= $this->render('show/components/checksource.phtml') ?>
<?= $this->render('show/components/actions.phtml') ?>
<?= $this->render('show/components/command.phtml') ?>
<?= $this->render('show/components/servicegroups.phtml') ?>

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
View File

@ -52,6 +52,7 @@ class StatusQuery extends IdoQuery
'host_output' => 'hs.output',
'host_long_output' => 'hs.long_output',
'host_perfdata' => 'hs.perfdata',
'host_check_source' => 'hs.check_source',
'host_acknowledged' => 'hs.problem_has_been_acknowledged',
'host_in_downtime' => 'CASE WHEN (hs.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
'host_handled' => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
@ -181,6 +182,7 @@ class StatusQuery extends IdoQuery
'service_output' => 'ss.output',
'service_long_output' => 'ss.long_output',
'service_perfdata' => 'ss.perfdata',
'service_check_source' => 'ss.check_source',
'service_acknowledged' => 'ss.problem_has_been_acknowledged',
'service_in_downtime' => 'CASE WHEN (ss.scheduled_downtime_depth = 0 OR ss.scheduled_downtime_depth IS NULL) THEN 0 ELSE 1 END',
'service_handled' => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END',

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
View File

@ -30,6 +30,7 @@ class StatusQuery extends StatusdatQuery
'host_output' => 'host.status.plugin_output',
'host_long_output' => 'host.status.long_plugin_output',
'host_perfdata' => 'host.status.performance_data',
'host_check_source' => 'host.status.check_source',
'host_acknowledged' => 'host.status.problem_has_been_acknowledged',
'host_last_state_change' => 'host.status.last_state_change',
'host_last_hard_state' => 'host.status.last_hard_state',
@ -82,6 +83,7 @@ class StatusQuery extends StatusdatQuery
'service_output' => 'service.status.output',
'service_long_output' => 'service.status.long_output',
'service_perfdata' => 'service.status.perfdata',
'service_check_source' => 'service.status.check_source',
'service_acknowledged' => 'service.status.problem_has_been_acknowledged',
'service_last_state_change' => 'service.status.last_state_change',
'service_check_command' => 'service.status.check_command',

1
modules/monitoring/library/Monitoring/DataView/HostStatus.php
View File

@ -62,6 +62,7 @@ class HostStatus extends DataView
'host_long_output',
'host_check_command',
'host_perfdata',
'host_check_source',
'host_passive_checks_enabled',
'host_passive_checks_enabled_changed',
'host_obsessing',

2
modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
View File

@ -90,6 +90,7 @@ class ServiceStatus extends DataView
'host_ipv4',
'host_severity',
'host_perfdata',
'host_check_source',
'host_active_checks_enabled',
'host_passive_checks_enabled',
'host_last_hard_state',
@ -102,6 +103,7 @@ class ServiceStatus extends DataView
'service_hard_state',
'service_problem',
'service_perfdata',
'service_check_source',
'service_active_checks_enabled',
'service_active_checks_enabled_changed',
'service_passive_checks_enabled',