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

Merge branch 'feature/is_reachable-columns-11404' 

resolves #11404
This commit is contained in:
Eric Lippmann 2016-04-11 10:30:39 +02:00
parent de81eb7e93 4cc4657ee9
commit 29c310b565
2 changed files with 106 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
modules/monitoring/library/Monitoring/DataView/Hoststatus.php
View File

@ -11,58 +11,56 @@ 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_is_reachable',
'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'
));
}

134
modules/monitoring/library/Monitoring/DataView/Servicestatus.php
View File

@ -11,93 +11,91 @@ 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_is_reachable',
'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'
));
}