diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index e843d8ecd..ca879cbaa 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -23,16 +23,9 @@ class Monitoring_ProcessController extends Controller
->add(
'info',
array(
- 'title' => $this->translate('Process Info'),
+ 'title' => $this->translate('Monitoring Health'),
'url' =>'monitoring/process/info'
)
- )
- ->add(
- 'performance',
- array(
- 'title' => $this->translate('Performance Info'),
- 'url' => 'monitoring/process/performance'
- )
);
}
@@ -41,7 +34,7 @@ class Monitoring_ProcessController extends Controller
*/
public function infoAction()
{
- $this->view->title = $this->translate('Process Info');
+ $this->view->title = $this->translate('Monitoring Health');
$this->getTabs()->activate('info');
$this->setAutorefreshInterval(10);
$this->view->backendName = $this->backend->getName();
@@ -80,6 +73,14 @@ class Monitoring_ProcessController extends Controller
->load($programStatus)
->handleRequest();
$this->view->toggleFeaturesForm = $toggleFeaturesForm;
+
+ $this->view->runtimevariables = (object) $this->backend->select()
+ ->from('runtimevariables', array('varname', 'varvalue'))
+ ->getQuery()->fetchPairs();
+
+ $this->view->checkperformance = $this->backend->select()
+ ->from('runtimesummary')
+ ->getQuery()->fetchAll();
}
/**
@@ -111,6 +112,9 @@ class Monitoring_ProcessController extends Controller
}
}
+ /**
+ * @todo should be dropped later
+ */
public function performanceAction()
{
$this->getTabs()->activate('performance');
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index c659544c2..33f7c557c 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -1,55 +1,171 @@
+runtimeVariables()->create($this->runtimevariables);
+$cp = $this->checkPerformance()->create($this->checkperformance);
+
+?>
- programStatus->is_currently_running === true): ?>
-
- = sprintf(
- $this->translate('%s has been up and running with PID %d since %s'),
- $this->backendName,
- $this->programStatus->process_id,
- $this->timeSince($this->programStatus->program_start_time)) ?>
+
+
+
+
= $this->translate('Feature Commands') ?>
+ = $this->toggleFeaturesForm ?>
+
+
+
+
= $this->translate('Process Info') ?>
+
+
+
+ = $this->translate('Program Start Time') ?> |
+ = $this->dateFormat()->formatDateTime($this->programStatus->program_start_time) ?> |
+
+
+ = $this->translate('Last Status Update'); ?> |
+ = $this->timeSince($this->programStatus->status_update_time) ?> ago |
+
+
+ = $this->translate('Last External Command Check'); ?> |
+ = $this->timeSince($this->programStatus->last_command_check) ?> ago |
+
+
+ = $this->translate('Last Log File Rotation'); ?> |
+ = $this->programStatus->last_log_rotation
+ ? $this->timeSince($this->programStatus->last_log_rotation)
+ : $this->translate('N/A') ?> |
+
+
+ = $this->translate('Global Service Event Handler'); ?> |
+ = $this->programStatus->global_service_event_handler
+ ? $this->programStatus->global_service_event_handler
+ : $this->translate('N/A'); ?> |
+
+
+ = $this->translate('Global Host Event Handler'); ?> |
+ = $this->programStatus->global_host_event_handler
+ ? $this->programStatus->global_host_event_handler
+ : $this->translate('N/A'); ?> |
+
+
+
+ programStatus->is_currently_running === true): ?>
+
+ = sprintf(
+ $this->translate('%s has been up and running with PID %d since %s'),
+ $this->backendName,
+ $this->programStatus->process_id,
+ $this->timeSince($this->programStatus->program_start_time)) ?>
+
+
+
+ = sprintf($this->translate('%s is not running'), $this->backendName) ?>
+
+
+
+
+
+
= $this->translate('Performance Info') ?>
+
+
Object summaries
+
+
+
+ |
+ overall |
+ scheduled |
+
+
+
+
+
+ Hosts
+ |
+
+ = $rv->total_hosts; ?>
+ |
+
+ = $rv->total_scheduled_hosts; ?>
+ |
+
+
+
+
+ Services
+ |
+
+ = $rv->total_services; ?>
+ |
+
+ = $rv->total_scheduled_services; ?>
+ |
+
+
+
+
+ Average services per host
+ |
+
+ = sprintf('%.2f', $rv->average_services_per_host); ?>
+ |
+
+ = sprintf('%.2f', $rv->average_scheduled_services_per_host); ?>
+ |
+
+
+
+
+
Active checks
+
+
+
+ |
+ |
+ Latency |
+ Execution time |
+
+
+
+
+
+ Host Checks
+ |
+ = $cp->host_active_count; ?> |
+ = sprintf('%.3f', $cp->host_active_latency_avg); ?>s |
+ = sprintf('%.3f', $cp->host_active_execution_avg); ?>s |
+
+
+
+ Service Checks
+ |
+ = $cp->service_active_count; ?> |
+ = sprintf('%.3f', $cp->service_active_latency_avg); ?>s |
+ = sprintf('%.3f', $cp->service_active_execution_avg); ?>s |
+
+
+
+
+
Passive checks
+
+
+
+
+ Host Checks
+ |
+ = $cp->host_passive_count; ?> |
+
+
+
+ Service Checks
+ |
+ = $cp->service_passive_count; ?> |
+
+
+
+
+
-
-
- = sprintf($this->translate('%s is not running'), $this->backendName) ?>
-
-
-
-
-
- = $this->translate('Program Start Time') ?> |
- = $this->dateFormat()->formatDateTime($this->programStatus->program_start_time) ?> |
-
-
- = $this->translate('Last Status Update'); ?> |
- = $this->timeSince($this->programStatus->status_update_time) ?> ago |
-
-
- = $this->translate('Last External Command Check'); ?> |
- = $this->timeSince($this->programStatus->last_command_check) ?> ago |
-
-
- = $this->translate('Last Log File Rotation'); ?> |
- = $this->programStatus->last_log_rotation
- ? $this->timeSince($this->programStatus->last_log_rotation)
- : $this->translate('N/A') ?> |
-
-
- = $this->translate('Global Service Event Handler'); ?> |
- = $this->programStatus->global_service_event_handler
- ? $this->programStatus->global_service_event_handler
- : $this->translate('N/A'); ?> |
-
-
- = $this->translate('Global Host Event Handler'); ?> |
- = $this->programStatus->global_host_event_handler
- ? $this->programStatus->global_host_event_handler
- : $this->translate('N/A'); ?> |
-
-
-
-
- = $this->toggleFeaturesForm ?>
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 64d8cb2fd..485050638 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -136,14 +136,10 @@ $section->add($this->translate('Alert Summary'), array(
* System Section
*/
$section = $this->menuSection($this->translate('System'));
-$section->add($this->translate('Process Info'), array(
+$section->add($this->translate('Monitoring Health'), array(
'url' => 'monitoring/process/info',
'priority' => 120
));
-$section->add($this->translate('Performance Info'), array(
- 'url' => 'monitoring/process/performance',
- 'priority' => 130
-));
/*
* Dashboard
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index dd9c89c92..8a759f736 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -173,3 +173,7 @@ table.benchmark {
.dashboard table.benchmark {
font-size: 0.9em;
}
+
+.left {
+ text-align: left !important;
+}
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 17a7b59fe..7beee80d0 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -311,6 +311,13 @@ a.critical {
.boxview div.box h2:first-child > a:hover {
}
+.boxview div.box h3 {
+ line-height: 1.5em;
+ font-size: 0.9em;
+ color: #555;
+ border-bottom: 1px solid #d9d9d9;
+}
+
/* Box body of contents */
.boxview div.box.contents {
padding: 0.2em;