diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php index 147f684df..94f1a60b8 100644 --- a/modules/monitoring/application/controllers/HostController.php +++ b/modules/monitoring/application/controllers/HostController.php @@ -103,7 +103,8 @@ class HostController extends MonitoredObjectController 'service_passive_checks_enabled', 'current_check_attempt' => 'service_current_check_attempt', 'max_check_attempts' => 'service_max_check_attempts', - 'service_check_command' + 'service_check_command', + 'service_next_update' )); $this->applyRestriction('monitoring/filter/objects', $query); $this->view->services = $query->where('host_name', $this->object->getName()); diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 56d620523..b9c71777e 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -159,7 +159,8 @@ class ListController extends Controller 'service_notifications_enabled', 'service_active_checks_enabled', 'service_passive_checks_enabled', - 'service_check_command' + 'service_check_command', + 'service_next_update' ), $this->addColumns())); $this->applyRestriction('monitoring/filter/objects', $services); diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index 25a18781a..7deacaf59 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -1,4 +1,5 @@ compact): ?> 'host' => $service->host_name, ) ); - $serviceStateName = Service::getStateText($service->service_state); ?> - + $serviceStateName = Service::getStateText($service->service_state); + $serviceCheckOverdue = $service->service_next_update < time(); ?> + > -
service_state, true) ?>
+
+ + icon('clock', sprintf($this->translate('Overdue %s'), DateFormatter::timeSince($service->service_next_update))) ?> + + service_state, true) ?> +
service_state !== 99): ?>
timeSince($service->service_last_state_change, $this->compact) ?>