From aced4f3b6e5f841e57f03d7dc36703ce1a7d1b43 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 11 Apr 2016 10:27:28 +0200 Subject: [PATCH 1/4] lib: Reorder columns in Servicestatus --- .../Monitoring/DataView/Servicestatus.php | 133 +++++++++--------- 1 file changed, 65 insertions(+), 68 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php index 1b03bd8ec..e6f8baed0 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php @@ -11,93 +11,90 @@ class ServiceStatus extends DataView public function getColumns() { return array_merge($this->getHookedColumns(), array( - 'instance_name', - 'host_name', - 'host_display_name', - 'host_state', - 'host_hard_state', - 'host_state_type', - 'host_last_state_change', + 'host_acknowledged', + 'host_action_url', + 'host_active_checks_enabled', 'host_address', 'host_address6', - 'host_problem', + 'host_alias', + 'host_check_source', + 'host_display_name', 'host_handled', - 'service_description', - 'service_display_name', - 'service_state', - 'service_hard_state', - 'service_in_downtime', - 'service_acknowledged', - 'service_handled', - 'service_unhandled', - 'service_output', - 'service_last_state_change', - 'service_long_output', - 'service_is_flapping', - 'service_state_type', - 'service_severity', - 'service_last_check', - 'service_notifications_enabled', - 'service_notifications_enabled_changed', - 'service_action_url', - 'service_notes', - 'service_notes_url', - 'service_last_check', - 'service_next_check', - 'service_attempt', - 'service_last_notification', - 'service_check_command', - 'service_current_notification_number', - 'host_acknowledged', - 'host_output', - 'host_long_output', + 'host_hard_state', 'host_in_downtime', + 'host_ipv4', 'host_is_flapping', 'host_last_check', - 'host_notifications_enabled', - 'host_unhandled_service_count', - 'host_action_url', - 'host_notes_url', - 'host_display_name', - 'host_alias', - 'host_ipv4', - 'host_severity', - 'host_perfdata', - 'host_check_source', - 'host_active_checks_enabled', - 'host_passive_checks_enabled', 'host_last_hard_state', 'host_last_hard_state_change', - 'host_last_time_up', + 'host_last_state_change', 'host_last_time_down', 'host_last_time_unreachable', + 'host_last_time_up', + 'host_long_output', 'host_modified_host_attributes', - 'service_hard_state', - 'service_problem', - 'service_perfdata', - 'service_check_source', - 'service_check_timeperiod', + 'host_name', + 'host_notes_url', + 'host_notifications_enabled', + 'host_output', + 'host_passive_checks_enabled', + 'host_perfdata', + 'host_problem', + 'host_severity', + 'host_state', + 'host_state_type', + 'host_unhandled_service_count', + 'instance_name', + 'service_acknowledged', + 'service_acknowledgement_type', + 'service_action_url', 'service_active_checks_enabled', 'service_active_checks_enabled_changed', - 'service_passive_checks_enabled', - 'service_passive_checks_enabled_changed', - 'service_last_hard_state', - 'service_last_hard_state_change', - 'service_last_time_ok', - 'service_last_time_warning', - 'service_last_time_critical', - 'service_last_time_unknown', + 'service_attempt', + 'service_check_command', + 'service_check_source', + 'service_check_timeperiod', 'service_current_check_attempt', - 'service_max_check_attempts', - 'service_obsessing', - 'service_obsessing_changed', + 'service_current_notification_number', + 'service_description', + 'service_display_name', 'service_event_handler_enabled', 'service_event_handler_enabled_changed', 'service_flap_detection_enabled', 'service_flap_detection_enabled_changed', - 'service_modified_service_attributes', + 'service_handled', + 'service_hard_state', 'service_host_name', - 'service_acknowledgement_type', + 'service_in_downtime', + 'service_is_flapping', + 'service_last_check', + 'service_last_hard_state', + 'service_last_hard_state_change', + 'service_last_notification', + 'service_last_state_change', + 'service_last_time_critical', + 'service_last_time_ok', + 'service_last_time_unknown', + 'service_last_time_warning', + 'service_long_output', + 'service_max_check_attempts', + 'service_modified_service_attributes', + 'service_next_check', + 'service_notes', + 'service_notes_url', + 'service_notifications_enabled', + 'service_notifications_enabled_changed', + 'service_obsessing', + 'service_obsessing_changed', + 'service_output', + 'service_passive_checks_enabled', + 'service_passive_checks_enabled_changed', + 'service_perfdata', + 'service_problem', + 'service_severity', + 'service_state', + 'service_state_type', + 'service_unhandled' )); } From a824637c0ed0e20c624d5a0270d50fe096e0ec42 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 11 Apr 2016 10:28:12 +0200 Subject: [PATCH 2/4] Add service_is_reachable column to the service status data view refs #11404 --- modules/monitoring/library/Monitoring/DataView/Servicestatus.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php index e6f8baed0..be6aab849 100644 --- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php @@ -67,6 +67,7 @@ class ServiceStatus extends DataView 'service_host_name', 'service_in_downtime', 'service_is_flapping', + 'service_is_reachable', 'service_last_check', 'service_last_hard_state', 'service_last_hard_state_change', From 750b8950b24de843bd894faf4fa50359333b0b86 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 11 Apr 2016 10:29:08 +0200 Subject: [PATCH 3/4] lib: Reorder columns in Hoststatus --- .../Monitoring/DataView/Hoststatus.php | 81 +++++++++---------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php index 8484dd9cc..e96b2e089 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php @@ -11,58 +11,55 @@ class HostStatus extends DataView public function getColumns() { return array_merge($this->getHookedColumns(), array( - 'instance_name', - 'host_name', - 'host_display_name', - 'host_alias', + 'host_acknowledged', + 'host_acknowledgement_type', + 'host_action_url', + 'host_active_checks_enabled', + 'host_active_checks_enabled_changed', 'host_address', 'host_address6', - 'host_state', - 'host_hard_state', - 'host_state_type', - 'host_handled', - 'host_unhandled', - 'host_in_downtime', - 'host_acknowledged', - 'host_last_state_change', - 'host_last_state_change', - 'host_last_notification', - 'host_last_check', - 'host_next_check', + 'host_alias', + 'host_check_command', 'host_check_execution_time', 'host_check_latency', - 'host_output', - 'host_long_output', - 'host_check_command', - 'host_check_timeperiod', - 'host_perfdata', 'host_check_source', - 'host_passive_checks_enabled', - 'host_passive_checks_enabled_changed', - 'host_obsessing', - 'host_obsessing_changed', - 'host_notifications_enabled', - 'host_notifications_enabled_changed', + 'host_check_timeperiod', + 'host_current_check_attempt', + 'host_current_notification_number', + 'host_display_name', 'host_event_handler_enabled', 'host_event_handler_enabled_changed', 'host_flap_detection_enabled', 'host_flap_detection_enabled_changed', - 'host_active_checks_enabled', - 'host_active_checks_enabled_changed', - 'host_current_check_attempt', - 'host_max_check_attempts', - 'host_last_notification', - 'host_current_notification_number', - 'host_percent_state_change', - 'host_is_flapping', - 'host_action_url', - 'host_notes_url', - 'host_percent_state_change', - 'host_modified_host_attributes', - 'host_severity', - 'host_problem', + 'host_handled', + 'host_hard_state', + 'host_in_downtime', 'host_ipv4', - 'host_acknowledgement_type' + 'host_is_flapping', + 'host_last_check', + 'host_last_notification', + 'host_last_state_change', + 'host_long_output', + 'host_max_check_attempts', + 'host_modified_host_attributes', + 'host_name', + 'host_next_check', + 'host_notes_url', + 'host_notifications_enabled', + 'host_notifications_enabled_changed', + 'host_obsessing', + 'host_obsessing_changed', + 'host_output', + 'host_passive_checks_enabled', + 'host_passive_checks_enabled_changed', + 'host_percent_state_change', + 'host_perfdata', + 'host_problem', + 'host_severity', + 'host_state', + 'host_state_type', + 'host_unhandled', + 'instance_name' )); } From 4cc4657ee915b4eb63b709a3ef2bff47facf03b5 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 11 Apr 2016 10:29:26 +0200 Subject: [PATCH 4/4] Add host_is_reachable column to the host status data view refs #11404 --- modules/monitoring/library/Monitoring/DataView/Hoststatus.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php index e96b2e089..8f02b70ac 100644 --- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php +++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php @@ -36,6 +36,7 @@ class HostStatus extends DataView 'host_in_downtime', 'host_ipv4', 'host_is_flapping', + 'host_is_reachable', 'host_last_check', 'host_last_notification', 'host_last_state_change',