Module: check_mk Branch: master Commit: 3cbd2e2402dc20445b642e73f13a95c00833c7c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cbd2e2402dc20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 27 09:12:21 2015 +0100 Small optical update for graph pages --- web/plugins/views/builtin.py | 55 ++++++++++++------------------------------ 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 0d0c818..7fcfae7 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1290,7 +1290,7 @@ multisite_builtin_views.update({ 'servicedescpnp': {'browser_reload': 90, 'column_headers': 'off', 'datasource': 'services', - 'description': _('PNP graphs for all Services with a certain description'), + 'description': _('Graphs for all Services with a certain description'), 'group_painters': [('host', 'hostpnp')], 'hard_filters': [], 'hard_filtervars': [('host', ''), @@ -1317,7 +1317,7 @@ multisite_builtin_views.update({ 'sorters': [('svcstate', False), ('site', False), ('site_host', False)], - 'title': _('PNP Graphs of services with description:'), + 'title': _('Graphs of services with description:'), 'topic': _('Other')}, 'servicegroup': {'browser_reload': 30, 'column_headers': 'pergroup', @@ -1547,41 +1547,19 @@ multisite_builtin_views.update({ 'searchpnp': {'browser_reload': 90, 'column_headers': 'off', 'datasource': 'services', - 'description': _('Search for services and display PNP graphs'), + 'description': _('Search for services and display their graphs'), 'group_painters': [('sitealias', 'sitehosts'), ('host', 'host'), ('service_description', 'service'), - ('svc_plugin_output', None)], + ], 'hard_filters': ['service_process_performance_data', 'has_performance_data', 'summary_host'], - 'hard_filtervars': [('is_service_in_notification_period', - '-1'), - ('is_service_process_performance_data', - '1'), - ('optservicegroup', ''), - ('is_service_notifications_enabled', - '-1'), - ('is_host_in_notification_period', '-1'), - ('is_has_performance_data', '1'), - ('is_service_scheduled_downtime_depth', - '-1'), - ('is_service_acknowledged', '-1'), - ('host', ''), - ('is_service_active_checks_enabled', - '-1'), - ('is_summary_host', '0'), - ('service', ''), - ('check_command', ''), - ('st0', 'on'), - ('st1', 'on'), - ('st2', 'on'), - ('st3', 'on'), - ('stp', ''), - ('opthostgroup', ''), - ('is_in_downtime', '-1'), - ('service_output', ''), - ('is_service_is_flapping', '-1')], + 'hard_filtervars': [ + ('is_service_process_performance_data', '1'), + ('is_has_performance_data', '1'), + ('is_summary_host', '0'), + ], 'hidden': False, 'hide_filters': [], 'icon' : 'pnp', @@ -1610,17 +1588,16 @@ multisite_builtin_views.update({ 'service_is_flapping'], 'sorters': [('site', False), ('site_host', False), - ('svcdescr', False)], + ('svcdescr', False) + ], 'title': _('Search Graphs'), 'topic': _('Addons')}, 'hostpnp': {'browser_reload': 90, 'column_headers': 'off', 'datasource': 'services', - 'description': _('All PNP performance graphs for a certain host.'), - 'group_painters': [('sitealias', 'sitehosts'), - ('host', 'host'), - ('service_description', 'service'), - ('svc_plugin_output', None)], + 'description': _('All graphs for a certain host.'), + 'group_painters': [ ('service_description', 'service'), + ], 'hard_filters': ['service_process_performance_data', 'has_performance_data', 'svcstate'], @@ -1650,8 +1627,8 @@ multisite_builtin_views.update({ ('site_host', False), ('svcdescr', False)], 'linktitle': _('Graphs'), - 'title': _('PNP graphs for host'), - 'topic': _('PNP4Nagios')}, + 'title': _('Graphs for host'), + }, 'recentsvc': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'services',