diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 8199db163..4ea9fddd5 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -111,7 +111,10 @@ class Monitoring_ListController extends ActionController 'host_unhandled_service_count', 'host_action_url', 'host_notes_url', - 'host_last_comment' + 'host_last_comment', + 'host_active_checks_enabled', + 'host_passive_checks_enabled' + ) )->getQuery(); $this->view->hosts = $query->paginate(); @@ -159,7 +162,9 @@ class Monitoring_ListController extends ActionController 'service_notifications_enabled', 'service_action_url', 'service_notes_url', - 'service_last_comment' + 'service_last_comment', + 'service_active_checks_enabled', + 'service_passive_checks_enabled' ) )->getQuery(); $this->view->services = $query->paginate(); diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php index 688f211a1..e0d298fc8 100644 --- a/modules/monitoring/application/controllers/ShowController.php +++ b/modules/monitoring/application/controllers/ShowController.php @@ -86,6 +86,7 @@ class Monitoring_ShowController extends ActionController public function serviceAction() { $this->view->object->prefetch(); + $this->view->preserve = array(); } /** @@ -94,6 +95,7 @@ class Monitoring_ShowController extends ActionController public function hostAction() { $this->view->object->prefetch(); + $this->view->preserve = array(); } /** diff --git a/modules/monitoring/application/views/helpers/MonitoringProperties.php b/modules/monitoring/application/views/helpers/MonitoringProperties.php index e25f5fe2b..5c434240b 100644 --- a/modules/monitoring/application/views/helpers/MonitoringProperties.php +++ b/modules/monitoring/application/views/helpers/MonitoringProperties.php @@ -107,7 +107,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildAttempt(stdClass $object) + private function buildAttempt(AbstractObject $object) { return sprintf( '%s/%s (%s state)', @@ -132,7 +132,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildCheckType(stdClass $object) + private function buildCheckType(AbstractObject $object) { if ($object->passive_checks_enabled === '1' && $object->active_checks_enabled === '0') { return self::CHECK_PASSIVE; @@ -148,7 +148,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildLatency(stdClass $object) + private function buildLatency(AbstractObject $object) { $val = ''; if ($this->buildCheckType($object) === self::CHECK_PASSIVE) { @@ -171,7 +171,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildNextCheck(stdClass $object) + private function buildNextCheck(AbstractObject $object) { if ($this->buildCheckType($object) === self::CHECK_PASSIVE) { return self::VALUE_NA; @@ -185,7 +185,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildLastStateChange(stdClass $object) + private function buildLastStateChange(AbstractObject $object) { return strftime('%Y-%m-%d %H:%M:%S', $object->last_state_change); } @@ -195,7 +195,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildLastNotification(stdClass $object) + private function buildLastNotification(AbstractObject $object) { $val = ''; @@ -215,7 +215,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildFlapping(stdClass $object) + private function buildFlapping(AbstractObject $object) { $val = ''; @@ -235,7 +235,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildScheduledDowntime(stdClass $object) + private function buildScheduledDowntime(AbstractObject $object) { if ($object->in_downtime === '1') { return self::VALUE_YES; @@ -253,10 +253,9 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract public function monitoringProperties(AbstractObject $object) { $type = $this->getObjectType($object); - $object = $this->dropObjectType($object, $type); + //$object = $this->dropObjectType($object, $type); $out = array(); - foreach (self::$keys as $property => $label) { $label = sprintf($label, ucfirst($type)); if (is_callable(array(&$this, $property))) { @@ -269,7 +268,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract return $out; } - public function getNotificationType(stdClass $notification) + public function getNotificationType(AbstractObject $notification) { $reason = intval($notification->notification_reason); if (!isset(self::$notificationReasons[$reason])) { diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 9229eba26..0d4481640 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -12,7 +12,7 @@ $viewHelper = $this->getHelper('MonitoringState'); - + @@ -24,67 +24,102 @@ $viewHelper = $this->getHelper('MonitoringState'); activeRowHref === $hostLink) ? 'class="active"' : ''; ?> > - + + + + -
StatusStatus Host Output
-
-
- -
- host_icon_image) : ?> + host_icon_image) : ?> - -
+ 		-
- host_handled && $host->host_state > 0): ?> - - {{UNHANDLED_ICON}} - - + host_handled && $host->host_state > 0): ?> + + {{UNHANDLED_ICON}} + + - host_acknowledged && !$host->host_in_downtime): ?> - - {{ACKNOWLEDGED_ICON}} - - + host_acknowledged && !$host->host_in_downtime): ?> + + {{ACKNOWLEDGED_ICON}} + + - host_is_flapping): ?> - - {{FLAPPING_ICON}} - + host_is_flapping): ?> + + {{FLAPPING_ICON}} + + + + host_notifications_enabled): ?> + + {{NOTIFICATIONS_DISABLED_ICON}} + + + + host_in_downtime): ?> + + {{IN_DOWNTIME_ICON}} + + + + host_active_checks_enabled): ?> + host_passive_checks_enabled): ?> + + {{ACTIVE_PASSIVE_CHECKS_DISABLED_ICON}} + + + + {{ACTIVE_CHECKS_DISABLED_ICON}} + -
- 		+ + host_last_comment !== null): ?> - + {{COMMENT_ICON}} + +
+ host_state_type == 0): ?> + + {{SOFTSTATE_ICON}} + + + monitoringState($host, 'host')); ?> + Since  + timeSince($host->host_last_state_change); ?> +
+ 		+ host_unhandled_service_count): ?> + + + host_unhandled_service_count; ?> + + + - host_name ?>
- host_address ?> + host_name ?>
+ host_address ?> - host_action_url != ""): ?> + host_action_url)): ?> Action - - host_notes_url != ""): ?> - Notes + host_notes_url)): ?> + Notes - 		escape(substr(strip_tags($host->host_output), 0, 10000)); ?>
- paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?> - + paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index 229b3f898..fb70d7f59 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -3,10 +3,11 @@ getHelper('MonitoringState'); ?> +
- sortControl->render($this); ?> - paginationControl($this->services, null, null, array('preserve' => $this->preserve)) ?> + sortControl->render($this); ?> + paginationControl($this->services, null, null, array('preserve' => $this->preserve)); ?> @@ -30,100 +31,106 @@ $viewHelper = $this->getHelper('MonitoringState'); 'host' => $service->host_name, ) ); - ?> + ?> activeRowHref === $serviceLink) ? 'class="active"' : ''; ?>> + - - - + - - + + + +
-
- service_icon_image) : ?> + service_icon_image) : ?> - -
+ 		-
- service_handled && $service->service_state > 0): ?> - - {{UNHANDLED_ICON}} - - + service_handled && $service->service_state > 0): ?> + + {{UNHANDLED_ICON}} + + - service_acknowledged && !$service->service_in_downtime): ?> - - {{ACKNOWLEDGED_ICON}} - - + service_acknowledged && !$service->service_in_downtime): ?> + + {{ACKNOWLEDGED_ICON}} + + - service_is_flapping): ?> - - {{FLAPPING_ICON}} - - + service_is_flapping): ?> + + {{FLAPPING_ICON}} + + - service_notifications_enabled): ?> - - {{NOTIFICATIONS_DISABLED_ICON}} - - + service_notifications_enabled): ?> + + {{NOTIFICATIONS_DISABLED_ICON}} + + - service_in_downtime): ?> - - {{IN_DOWNTIME_ICON}} - - + service_in_downtime): ?> + + {{IN_DOWNTIME_ICON}} + + -
- 		-
- monitoringState($service, 'service')); ?> - -
- 		service_last_comment !== null): ?> - + {{COMMENT_ICON}} + +
+ service_state_type == 0): ?> + + {{SOFTSTATE_ICON}} + + + monitoringState($service, 'service')); ?> + Since  + timeSince($service->service_last_state_change); ?> +
+ 		service_display_name; ?>
- service_action_url != ""): ?> + service_action_url)): ?> Action - service_notes_url != ""): ?> + service_notes_url)): ?> Notes - 		- - host_name; ?> + host_handled && $service->host_state > 0): ?> + + {{UNHANDLED_ICON}} + + + + host_name; ?> + host_state != 0): ?> + (monitoringState($service, 'host')); ?>) + +
host_address ?> - -
- (monitoringState($service, 'host')); ?>) -
- - host_address ?> - 		@@ -133,4 +140,5 @@ $viewHelper = $this->getHelper('MonitoringState');
-
\ No newline at end of file + paginationControl($this->services, null, null, array('preserve' => $this->preserve)); ?> + diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml index b58838045..f5f4254b7 100644 --- a/modules/monitoring/application/views/scripts/show/history.phtml +++ b/modules/monitoring/application/views/scripts/show/history.phtml @@ -4,83 +4,4 @@ $history->limit(10); $hhistory = $this->history->paginate(); ?> - -There are no matching history entries right now - -paginationControl($hhistory, null, null, array('preserve' => $preserve)); ?> - - - - object_type == 'host') { - $states = array('up', 'down', 'unreachable', 'unknown', 99 => 'pending', null => 'pending'); - } else { - $states = array('ok', 'warning', 'critical', 'unknown', 99 => 'pending', null => 'pending'); - } - - ?> - - - - - - - - - - - - - - -
timestamp ) ?>escape($event->host_name) ?> - - service_description; ?> - - - escape($event->service_description) ?> - - - type) { - case 'notify': - echo 'NOTIFICATION_ICON'; - break; - case 'comment': - echo 'COMMENT_ICON'; - break; - case 'ack': - echo 'ACKNOWLEDGEMENT_ICON'; - break; - case 'dt_comment': - echo 'IN_DOWNTIME_ICON'; - break; - case 'flapping': - echo 'FLAPPING_ICON'; - break; - case 'hard_state': - echo 'HARDSTATE_ICON'; - break; - case 'soft_state': - echo 'SOFTSTATE_ICON'; - break; - case 'dt_start': - echo 'DOWNTIME_START_ICON'; - echo ' Downtime start'; - break; - case 'dt_end': - echo 'DOWNTIME_END_ICON'; - echo ' Downtime end'; - break; - } - ?> - attempt !== null): ?> - [ attempt ?>/max_attempts ?> ] - -
- diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml index be1ca49d6..da64a5813 100644 --- a/modules/monitoring/application/views/scripts/show/service.phtml +++ b/modules/monitoring/application/views/scripts/show/service.phtml @@ -15,3 +15,5 @@ render('show/components/perfdata.phtml'); ?> render('show/components/properties.phtml'); ?> + +render('show/components/eventHistory.phtml'); ?> diff --git a/modules/monitoring/library/Monitoring/DataView/HostAndServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/HostAndServiceStatus.php index bd3771459..cd9f073ec 100644 --- a/modules/monitoring/library/Monitoring/DataView/HostAndServiceStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/HostAndServiceStatus.php @@ -76,6 +76,8 @@ class HostAndServiceStatus extends DataView 'service_last_time_warning', 'service_last_time_critical', 'service_last_time_unknown', + 'service_current_check_attempt', + 'service_max_check_attempts' // 'object_type', // 'problems', // 'handled', @@ -116,7 +118,7 @@ class HostAndServiceStatus extends DataView public function getFilterColumns() { - return array('hostgroups', 'servicegroups'); + return array('hostgroups', 'servicegroups', 'service_problems'); } protected function isValidFilterColumn($column) diff --git a/modules/monitoring/library/Monitoring/Object/AbstractObject.php b/modules/monitoring/library/Monitoring/Object/AbstractObject.php index 666572938..982b34930 100644 --- a/modules/monitoring/library/Monitoring/Object/AbstractObject.php +++ b/modules/monitoring/library/Monitoring/Object/AbstractObject.php @@ -142,4 +142,22 @@ abstract class AbstractObject )->fetchPairs(); return $this; } + + protected function fetchEventHisoty() + { + $this->foreign['eventHistory'] = $this->applyObjectFilter( + $this->backend->select()->from('eventHistory', array( + 'object_type', + 'host_name', + 'service_description', + 'timestamp', + 'state', + 'attempt', + 'max_attempts', + 'output', + 'type' + )) + ); + return $this; + } } diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php index ba9d0ea11..b0d780604 100644 --- a/modules/monitoring/library/Monitoring/Object/Service.php +++ b/modules/monitoring/library/Monitoring/Object/Service.php @@ -31,7 +31,8 @@ class Service extends AbstractObject ->fetchContacts() ->fetchContactgroups() ->fetchCustomvars() - ->fetchComments(); + ->fetchComments() + ->fetchEventHisoty(); } protected function fetchObject() @@ -59,6 +60,16 @@ class Service extends AbstractObject 'long_output' => 'service_long_output', 'check_command' => 'service_check_command', 'perfdata' => 'service_perfdata', + 'current_check_attempt' => 'service_current_check_attempt', + 'max_check_attemt' => 'service_max_check_attempts', + 'state_type' => 'service_state_type', + 'passive_checks_enabled' => 'service_passive_checks_enabled', + 'last_state_change' => 'service_last_state_change', + 'last_notification' => 'service_last_notification', + 'current_notification_number' => 'service_current_notification_number', + 'is_flapping' => 'service_is_flapping', + 'percent_state_change' => 'service_percent_state_change', + 'in_downtime' => 'service_in_downtime' )) ->where('host_name', $this->name1) ->where('service_description', $this->name2)