[checkmk-commits] Check_MK Git: check_mk: Cleaned up details views for hosts and services

Module: check_mk Branch: master Commit: e1c7131f63f50fbb5443448a91ebffd27193e118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1c7131f63f50f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 09:30:29 2015 +0100 Cleaned up details views for hosts and services New structure is now well defined: 1. Identification 2. State of check 3. Further runtime data, timestamps, etc. 4. Configuration --- web/plugins/views/builtin.py | 162 +++++++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 73 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 7fcfae7..ce51081 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -998,44 +998,54 @@ multisite_builtin_views.update({ 'mustsearch': False, 'name': 'hoststatus', 'owner': '', - 'painters': [('sitealias', None), - ('host', 'host'), - ('alias', None), - ('host_icons', None), - ('host_state', None), - ('host_address', None), - ('host_group_memberlist', None), - ('host_parents', None), - ('host_childs', None), - ('host_servicelevel', None), - ('host_contact_groups', None), - ('host_contacts', None), - ('host_plugin_output', None), - ('host_perf_data', None), - ('host_attempt', None), - ('host_notification_number', None), - ('host_check_interval', None), - ('host_check_type', None), - ('host_state_age', None), - ('host_check_age', None), - ('host_next_check', None), - ('host_next_notification', None), - ('host_last_notification', None), - ('host_check_latency', None), - ('host_check_duration', None), - ('host_in_downtime', None), - ('host_in_notifper', None), - ('host_notifper', None), - ('host_custom_vars', None), - ('num_services', None), - ('num_services_ok', 'host_ok'), - ('num_services_warn', 'host_warn'), - ('num_services_crit', 'host_crit'), - ('num_services_unknown', 'host_unknown'), - ('num_services_pending', 'host_pending'), - ('host_custom_notes', None), - ('host_pnpgraph', None), - ], + 'painters': [ + # 1. Identification and icons + ('sitealias', None), + ('host', 'host'), + ('host_parents', None), + ('host_childs', None), + ('host_address', None), + ('alias', None), + ('host_icons', None), + + # 2. State and metrics + ('host_state', None), + ('host_plugin_output', None), + ('host_pnpgraph', None), + ('host_perf_data', None), + ('host_in_downtime', None), + ('host_in_notifper', None), + + # 2b. Serivce statistics + ('num_services', None), + ('num_services_ok', 'host_ok'), + ('num_services_warn', 'host_warn'), + ('num_services_crit', 'host_crit'), + ('num_services_unknown', 'host_unknown'), + ('num_services_pending', 'host_pending'), + + # 3. Runtime data, timestamps + ('host_attempt', None), + ('host_notification_number', None), + ('host_state_age', None), + ('host_check_age', None), + ('host_next_check', None), + ('host_next_notification', None), + ('host_last_notification', None), + ('host_check_latency', None), + ('host_check_duration', None), + + # 4. Configuration + ('host_check_interval', None), + ('host_notifper', None), + ('host_contact_groups', None), + ('host_contacts', None), + ('host_group_memberlist', None), + ('host_servicelevel', None), + ('host_check_command', None), + ('host_custom_vars', None), + ('host_custom_notes', None), + ], 'public': True, 'show_filters': [], 'sorters': [], @@ -1214,41 +1224,47 @@ multisite_builtin_views.update({ 'name': 'service', 'num_columns': 1, 'owner': '', - 'painters': [('sitealias', None), - ('host', 'hoststatus'), - ('service_description', 'servicedesc'), - ('service_icons', None), - ('service_state', None), - ('svc_group_memberlist', None), - ('svc_servicelevel', None), - ('svc_contact_groups', None), - ('svc_contacts', None), - ('svc_plugin_output', None), - ('svc_long_plugin_output', None), - ('svc_perf_data', None), - ('perfometer', None), - ('svc_check_command', None), - ('svc_check_interval', None), - ('svc_attempt', None), - ('svc_notification_number', None), - ('svc_check_type', None), - ('svc_state_age', None), - ('svc_last_time_ok', None), - ('svc_check_age', None), - ('svc_next_check', None), - ('svc_next_notification', None), - ('svc_last_notification', None), - ('svc_check_latency', None), - ('svc_check_duration', None), - ('svc_in_downtime', None), - ('svc_in_notifper', None), - ('svc_notifper', None), - ('service_display_name', None), - ('svc_custom_vars', None), - ('check_manpage', None), - ('svc_custom_notes', None), - ('svc_pnpgraph', None), - ], + 'painters': [ + # 1. Identification and icons + ('sitealias', None), + ('host', 'hoststatus'), + ('service_description', 'servicedesc'), + ('service_icons', None), + + # 2. State and metrics + ('service_state', None), + ('svc_plugin_output', None), + ('svc_long_plugin_output', None), + ('perfometer', None), + ('svc_pnpgraph', None), + ('svc_perf_data', None), + ('svc_in_downtime', None), + ('svc_in_notifper', None), + + # 3. Runtime data, timestamps + ('svc_attempt', None), + ('svc_notification_number', None), + ('svc_state_age', None), + ('svc_check_age', None), + ('svc_next_check', None), + ('svc_next_notification', None), + ('svc_last_notification', None), + ('svc_last_time_ok', None), + ('svc_check_latency', None), + ('svc_check_duration', None), + + # 4. Configuration + ('svc_check_interval', None), + ('svc_notifper', None), + ('svc_contact_groups', None), + ('svc_contacts', None), + ('svc_group_memberlist', None), + ('svc_servicelevel', None), + ('svc_check_command', None), + ('svc_custom_vars', None), + ('check_manpage', None), + ('svc_custom_notes', None), + ], 'public': True, 'show_filters': [], 'sorters': [],