Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: Additional try to fix availability for host- and servicegroup views based on host /service info

by Lars Michelsen

Module: check_mk Branch: master Commit: 441c743ff0f9e5fecc75723aa121054f32bce3ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=441c743ff0f9e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 12 16:38:04 2015 +0200 Additional try to fix availability for host- and servicegroup views based on host/service info --- web/htdocs/views.py | 13 +++++++--- web/htdocs/visuals.py | 50 +++++++++++++++++++++++++++++++++----- web/plugins/views/builtin.py | 4 +-- web/plugins/views/datasources.py | 13 +++++++++- 4 files changed, 68 insertions(+), 12 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f7ae63d..300ff4d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -941,7 +941,8 @@ def show_view(view, show_heading = False, show_buttons = True, # Filters to use in the view # In case of single object views, the needed filters are fixed, but not always present # in context. In this case, take them from the context type definition. - use_filters = visuals.filters_of_visual(view, datasource['infos'], all_filters_active) + use_filters = visuals.filters_of_visual(view, datasource['infos'], + all_filters_active, datasource.get('link_filters', {})) # Not all filters are really shown later in show_filter_form(), because filters which # have a hardcoded value are not changeable by the user @@ -955,7 +956,7 @@ def show_view(view, show_heading = False, show_buttons = True, visuals.add_context_to_uri_vars(view, datasource["infos"], only_count) # Check that all needed information for configured single contexts are available - visuals.verify_single_contexts('views', view) + visuals.verify_single_contexts('views', view, datasource.get('link_filters', {})) # Af any painter, sorter or filter needs the information about the host's # inventory, then we load it and attach it as column "host_inventory" @@ -1167,7 +1168,7 @@ def render_view(view, rows, datasource, group_painters, painters, # Take into account: layout capabilities can_display_checkboxes and not view.get("force_checkboxes"), show_checkboxes, # Show link to availability - "host" in datasource["infos"] or "service" in datasource["infos"] or "aggr" in datasource["infos"]) + datasource["table"] in [ "hosts", "services" ] or "aggr" in datasource["infos"]) # User errors in filters html.show_user_errors() @@ -2091,6 +2092,12 @@ def url_to_view(row, view_name): new_vars = filter_object.variable_settings(row) vars += new_vars + # See get_link_filter_names() comment for details + for src_key, dst_key in visuals.get_link_filter_names(view, datasource['infos'], + datasource.get('link_filters', {})): + vars += visuals.get_filter(src_key).variable_settings(row) + vars += visuals.get_filter(dst_key).variable_settings(row) + do = html.var("display_options") if do: vars.append(("display_options", do)) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 573c5c9..fc64769 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -897,9 +897,33 @@ def filters_allowed_for_info(info): allowed[fname] = filt return allowed +# For all single_infos which are configured for a view which datasource +# does not provide these infos, try to match the keys of the single_info +# attributes to a filter which can then be used to filter the data of +# the available infos. +# This is needed to make the "hostgroup" single_info possible on datasources +# which do not have the "hostgroup" info, but the "host" info. This +# is some kind of filter translation between a filter of the "hostgroup" info +# and the "hosts" info. +def get_link_filter_names(visual, info_keys, link_filters): + names = [] + for info_key in visual['single_infos']: + if info_key not in info_keys: + for key in info_params(info_key): + if key in link_filters: + names.append((key, link_filters[key])) + return names + # Collects all filters to be used for the given visual -def filters_of_visual(visual, info_keys, show_all=False): +def filters_of_visual(visual, info_keys, show_all=False, link_filters=[]): filters = [] + + # Collect all available filters for these infos + all_possible_filters = [] + for filter_name, filter in multisite_filters.items(): + if filter.info in info_keys: + all_possible_filters.append(filter) + for info_key in info_keys: if info_key in visual['single_infos']: for key in info_params(info_key): @@ -909,10 +933,12 @@ def filters_of_visual(visual, info_keys, show_all=False): if type(val) == dict: # this is a real filter filters.append(get_filter(key)) + # See get_link_filter_names() comment for details + for key, dst_key in get_link_filter_names(visual, info_keys, link_filters): + filters.append(get_filter(dst_key)) + if show_all: # add *all* available filters of these infos - for filter_name, filter in multisite_filters.items(): - if filter.info in info_keys: - filters.append(filter) + filters += all_possible_filters # add ubiquitary_filters that are possible for these infos for fn in ubiquitary_filters: @@ -941,6 +967,10 @@ def visible_filters_of_visual(visual, use_filters): return show_filters +def apply_link_filter_vars_to_uri_vars(visual, info_keys, link_filters): + for src_key, dst_key in get_link_filter_names(visual, info_keys, link_filters): + html.set_var(dst_key, html.var(src_key)) + def add_context_to_uri_vars(visual, only_infos=None, only_count=False): if only_infos == None: only_infos = infos.keys() # all datasources! @@ -1156,9 +1186,9 @@ def single_infos_spec(single_infos): or _('Not restricted to showing a specific object.'), )) -def verify_single_contexts(what, visual): +def verify_single_contexts(what, visual, link_filters): for k, v in get_singlecontext_html_vars(visual).items(): - if v == None: + if v == None and k not in link_filters: raise MKUserError(k, _('This %s can not be displayed, because the ' 'necessary context information "%s" is missing.') % (visual_types[what]['title'], k)) @@ -1292,6 +1322,14 @@ def collect_context_links_of(visual_type_name, this_visual, active_filter_vars, break vars_values.append((var, val)) + # See get_link_filter_names() comment for details. TODO Hack for host/service + # views with single hostgroup context. Will be cleaned up soon. hopefully + if visual.get('datasource') in ['hosts', 'services']: + if 'hostgroup' in visual['single_infos']: + vars_values.append(('opthost_group', html.var('hostgroup'))) + if 'servicegroup' in visual['single_infos']: + vars_values.append(('optservice_group', html.var('servicegroup'))) + if not skip: # add context link to this visual. For reports we put in # the *complete* context, even the non-single one. diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3e9b41b..d4753da 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -764,7 +764,7 @@ multisite_builtin_views.update({ 'title': _('Problems of host')}, 'hostgroup': {'browser_reload': 30, 'column_headers': 'off', - 'datasource': 'hostsbygroup', + 'datasource': 'hosts', 'description': _('Lists members of a host group with the number of services in the different states.'), 'group_painters': [('site_icon', None), ('sitealias', 'sitehosts')], @@ -1342,7 +1342,7 @@ multisite_builtin_views.update({ 'topic': _('Other')}, 'servicegroup': {'browser_reload': 30, 'column_headers': 'pergroup', - 'datasource': 'servicesbygroup', + 'datasource': 'services', 'description': _('Services of a service group'), 'group_painters': [('sitealias', 'sitehosts'), ('host', 'host')], diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index a861ae7..7aa06c1 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -79,7 +79,11 @@ multisite_datasources["hosts"] = { "keys" : [ "host_name", "host_downtimes" ], "join" : ( "services", "host_name" ), "idkeys" : [ "site", "host_name" ], - "description" : _("Displays a list of hosts."), + "description" : _("Displays a list of hosts."), + # When the single info "hostgroup" is used, use the "opthostgroup" filter + # to handle the data provided by the single_spec value of the "hostgroup" + # info, which is in fact the name of the wanted hostgroup + "link_filters" : { "hostgroup": "opthostgroup" }, } multisite_datasources["hostsbygroup"] = { @@ -99,6 +103,13 @@ multisite_datasources["services"] = { "keys" : [ "host_name", "service_description", "service_downtimes" ], "joinkey" : "service_description", "idkeys" : [ "site", "host_name", "service_description" ], + # When the single info "hostgroup" is used, use the "opthostgroup" filter + # to handle the data provided by the single_spec value of the "hostgroup" + # info, which is in fact the name of the wanted hostgroup + "link_filters" : { + "hostgroup" : "opthostgroup", + "servicegroup" : "optservicegroup", + }, } multisite_datasources["servicesbygroup"] = {

9 years, 1 month

Check_MK Git: check_mk: Support for displaying new agent caching information from CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: f046b5f52939cdaf915ac502c1f94f5236cde877 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f046b5f52939cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 12 13:44:43 2015 +0200 Support for displaying new agent caching information from CMC --- agents/check_mk_agent.linux | 14 ++++++---- livestatus/src/FixedIntColumn.h | 40 +++++++++++++++++++++++++++ livestatus/src/TableServices.cc | 5 ++++ modules/check_mk.py | 2 ++ modules/check_mk_base.py | 55 +++++++++++++++++++++++++++++-------- web/htdocs/htmllib.py | 1 - web/htdocs/images/icon_cached.png | Bin 0 -> 3979 bytes web/plugins/icons/builtin.py | 8 +++--- web/plugins/views/builtin.py | 1 + web/plugins/views/painters.py | 29 +++++++++++++++++-- 10 files changed, 131 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f046b5f529…

9 years, 1 month

Check_MK Git: check_mk: Added manpages for icom_repeater checks

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3a83b97d10989ea830771a254f9eebe7327d54fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a83b97d10989e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue May 12 11:28:45 2015 +0200 Added manpages for icom_repeater checks --- checkman/icom_repeater | 11 +++++++++++ checkman/icom_repeater.pll_volt | 24 +++++++++++++++++++++++ checkman/icom_repeater.temp | 40 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/checkman/icom_repeater b/checkman/icom_repeater new file mode 100644 index 0000000..a54ba2b --- /dev/null +++ b/checkman/icom_repeater @@ -0,0 +1,11 @@ +title: ICOM Repeater: Operation Status +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the operation status of ICOM repeaters. It + interprets off as CRIT, on as OK and all other states as UNKNOWN. + +inventory: + One check per device is created. diff --git a/checkman/icom_repeater.pll_volt b/checkman/icom_repeater.pll_volt new file mode 100644 index 0000000..dc9f556 --- /dev/null +++ b/checkman/icom_repeater.pll_volt @@ -0,0 +1,24 @@ +title: ICOM Repeater: PLL Lock Voltage +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the RX and TX PLL lock voltage + +item: + "RX" or "TX" + +perfdata: + One value: The current voltage + +inventory: + One check per PLL is created. + +[parameters] + parameters(dict): This checks parameters are a dictionary with the + (optional) keys {"rx"} and {"tx"}, under each of which lies a list of + tuples (frequency, (warn_lower, crit_lower, warn, crit)), where frequency is + the upper boundary of the frequency range for which the parameters + (warn_lower, crit_lower, warn, crit) + diff --git a/checkman/icom_repeater.temp b/checkman/icom_repeater.temp new file mode 100644 index 0000000..3f4f34f --- /dev/null +++ b/checkman/icom_repeater.temp @@ -0,0 +1,40 @@ +title: ICOM Repeater: Temperature +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the system temperature of ICOM repeaters. + +item: + Always "System" + +perfdata: + One value: The current temperature. + +inventory: + One check per device is created. + +[parameters] +parameters(dict): This checks parameters are a dictionary with the +following (optional) keys: + + {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (50, 55) + + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. Default: (-20, -25) + + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the + specified unit. If this is not set, output is in degrees Celsius. + + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value + according to the unit sent by the device. This key allows to override that. Tread + lightly, as this may lead to a misinterpreted temperature. Should only be used if + the device reports its unit incorrectly. + + {"device_levels_handling"}: Specifies how the temperature status + (too hot/too cold) provided by the device, respectively the device's levels are + handled compared to levels set by the user. Options are "usr", "dev", + "best", "worst", "devdefault", "usrdefault". "usr" and "dev" means respecting + only the user's resp. the device's levels, wheras "usrdefault" and "devdefault" + take the user's resp. the device's levels if present, otherwise try to use the + device's resp. the user's levels.

9 years, 1 month

Check_MK Git: check_mk: icom_repeater: fixed broken temperature check

by Andreas Boesl

Module: check_mk Branch: master Commit: 3d1e4360cfa77b64857d70d13bbc34baa5da237e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d1e4360cfa77b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 12 10:39:58 2015 +0200 icom_repeater: fixed broken temperature check --- checks/icom_repeater | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/icom_repeater b/checks/icom_repeater index 4b59ee0..cdc67b9 100644 --- a/checks/icom_repeater +++ b/checks/icom_repeater @@ -222,7 +222,7 @@ factory_settings["icom_repeater_temp_default_levels"] = { def inventory_icom_repeater_temp(parsed): if "temp" in parsed: - return [ (None, {}) ] + return [ ("System", {}) ] def check_icom_repeater_temp(_no_item, params, parsed):

9 years, 1 month

Check_MK Git: check_mk: Fix majority computation in new matrix layout

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b97b717172052683627b94afdc3dd6ae5c2257f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b97b717172052… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 11 16:51:39 2015 +0200 Fix majority computation in new matrix layout --- web/plugins/views/layouts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index d8171e0..a2a6eab 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -536,7 +536,7 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho for group, group_row in groups: tdclass, content = prepare_paint(painter, group_row) if painter_nr > 0: - gv = group_value(group_row, [painter])[0] + gv = group_value(group_row, [painter]) majority_value = header_majorities.get(painter_nr-1, None) if majority_value != None and majority_value != gv: tdclass += " minority" @@ -620,7 +620,7 @@ def matrix_find_majorities(rows, painters, for_header): if for_header: - return majorities[None] + return majorities.get(None, {}) else: return counts, majorities

9 years, 1 month

Check_MK Git: check_mk: Fix title in temperature WATO rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: b0d82670094f787753a3f1d432e7382a4fe426af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d82670094f78… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon May 11 16:08:51 2015 +0200 Fix title in temperature WATO rule --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 250f3e3..23f7e61 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6081,8 +6081,8 @@ register_check_parameters( Tuple( title = _("Lower Temperature Levels"), elements = [ - Integer(title = _("warning at"), unit = u"°C", default_value = 0), - Integer(title = _("critical at"), unit = u"°C", default_value = -10), + Integer(title = _("warning below"), unit = u"°C", default_value = 0), + Integer(title = _("critical below"), unit = u"°C", default_value = -10), ] )), ( "output_unit",

9 years, 1 month

Check_MK Git: check_mk: Minor Fix: Hide new performance matrix view in sidebar

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9f3fa0c0beadfef385ba30b9c4da2d0e8a019510 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f3fa0c0beadfe… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon May 11 15:08:10 2015 +0200 Minor Fix: Hide new performance matrix view in sidebar --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index b83466e..db8f65e 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2194,7 +2194,7 @@ multisite_builtin_views.update({ 'datasource': 'servicesbyhostgroup', 'description': _('A Matrix of Performance data values from all hosts in a certain host group'), 'group_painters': [('host', 'host', None)], - 'hidden': False, + 'hidden': True, 'hidebutton': False, 'icon': 'matrix', 'layout': 'matrix',

9 years, 1 month

Check_MK Git: check_mk: Removed debug code

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ddded519b859f3b644bb7cb695585ada266ff4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ddded519b859f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 11 14:39:47 2015 +0200 Removed debug code --- web/plugins/views/layouts.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index ff80763..d8171e0 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -522,7 +522,6 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho header_majorities = matrix_find_majorities(rows, group_painters, True) value_counts, row_majorities = matrix_find_majorities(rows, painters, False) - html.debug(value_counts) for groups, unique_row_ids, matrix_cells in \ create_matrices(rows, group_painters, painters, num_columns):

9 years, 1 month

Check_MK Git: check_mk: Matrix layout: option for omitting rows with uniform values

by Mathias Kettner

Module: check_mk Branch: master Commit: 216b2a375ba4e85a3f9efaed099079dd38948f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=216b2a375ba4e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 11 14:36:11 2015 +0200 Matrix layout: option for omitting rows with uniform values --- web/htdocs/status.css | 24 +++++++++++++++++++++--- web/htdocs/views.css | 4 ++-- web/htdocs/views.py | 2 +- web/plugins/config/builtin.py | 3 +++ web/plugins/views/layouts.py | 22 +++++++++++++++++----- 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index c4ba9c0..798db16 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -57,27 +57,45 @@ table.data td.perfometer.stale div.title { /* OK/UP */ +/* TODO: Replace class "odd0" with "odd state0" */ .state0, .hstate0, .state0 a, .hstate0 a { background-color: #0b3; color: #fff; } +.odd0 .state0, .odd0 .hstate0, .odd0 .state0 a, .odd0 .hstate0 a { + background-color: #1c4; +} +.even0 .state0, .even0 .hstate0, .even0 .state0 a, .even0 .hstate0 a { + background-color: #0b3; +} + .hstate { white-space: nowrap; } /* WARN */ -.state1, .state1 a, tr.groupheader td.state1 { - background-color: #ff0; color: #000; +.state1, .even1 .state1, .state1 a, tr.groupheader td.state1 { + background-color: #f8f800; color: #000; +} +.odd0 .state1, .odd1 .state1 { + background-color: #ff5; } /* CRIT/DOWN */ -.state2, .hstate1, .state2 a, .hstate2 a { +.state2, .even0 .state2, .even2 .state2, .hstate1, .state2 a, .hstate2 a { background-color: #f00; color: #fff; } +.odd0 .state2, .odd2 .state2 { + background-color: #f44; +} + /* UNKNOWN / UNREACH */ .state3, .hstate2, .state3 a, .hstate2 a { background-color: #f80; color: #fff; } +.odd0 .state3, .odd3 .state3 { + background-color: #f91; +} /* PENDING */ .statep, .hstatep, .statep a, .hstatep a { diff --git a/web/htdocs/views.css b/web/htdocs/views.css index e9d9c08..a8dc994 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -416,10 +416,10 @@ table.data.matrix tr.matrixhead td.left { color: white; } -table.data.matrix tr.even0 td.minority { +.even0 .minority { background-color: #cff; } -table.data.matrix tr.odd0 td.minority { +.odd0 .minority { background-color: #dff; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7706710..f7ae63d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2302,7 +2302,7 @@ def group_value(row, group_painters): else: for c in p[0]["columns"]: group.append(row[c]) - return group + return tuple(group) def get_painter_option(name): opt = multisite_painter_options[name] diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 8ae8501..cd840ab 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -110,6 +110,9 @@ sounds = [ view_option_refreshes = [ 30, 60, 90, 0 ] view_option_columns = [ 1, 2, 3, 4, 5, 6, 8, 10, 12 ] +# Experimental: +matrix_omit_uniform_lines = False + # MISC doculink_urlformat = "http://mathias-kettner.de/checkmk_%s.html"; diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 0b648e0..ff80763 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -521,7 +521,8 @@ multisite_layouts["table"] = { def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): header_majorities = matrix_find_majorities(rows, group_painters, True) - row_majorities = matrix_find_majorities(rows, painters, False) + value_counts, row_majorities = matrix_find_majorities(rows, painters, False) + html.debug(value_counts) for groups, unique_row_ids, matrix_cells in \ create_matrices(rows, group_painters, painters, num_columns): @@ -545,6 +546,16 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho # Now for each unique service^H^H^H^H^H^H ID column paint one row for row_id in unique_row_ids: + # Omit rows where all cells have the same values + if config.matrix_omit_uniform_lines: + at_least_one_different = False + for counts in value_counts[row_id].values(): + if len(counts) > 1: + at_least_one_different = True + break + if not at_least_one_different: + continue + odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) tdclass, content = prepare_paint(painters[0], matrix_cells[row_id].values()[0]) @@ -586,12 +597,13 @@ def matrix_find_majorities(rows, painters, for_header): else: row_id = tuple(group_value(row, [ painters[0] ])) for painter_nr, painter in enumerate(painters[1:]): - value = group_value(row, [painter])[0] + value = group_value(row, [painter]) row_entry = counts.setdefault(row_id, {}) painter_entry = row_entry.setdefault(painter_nr, {}) painter_entry.setdefault(value, 0) painter_entry[value] += 1 + # Now find majorities for each row majorities = {} # row_id -> painter_nr -> majority value for row_id, row_entry in counts.items(): @@ -611,7 +623,7 @@ def matrix_find_majorities(rows, painters, for_header): if for_header: return majorities[None] else: - return majorities + return counts, majorities # Create list of matrices to render def create_matrices(rows, group_painters, painters, num_columns): @@ -633,7 +645,7 @@ def create_matrices(rows, group_painters, painters, num_columns): for row in rows: register_events(row) # needed for playing sounds - group_id = tuple(group_value(row, group_painters)) + group_id = group_value(row, group_painters) if group_id != last_group_id: col_num += 1 if col_num > num_columns: @@ -649,7 +661,7 @@ def create_matrices(rows, group_painters, painters, num_columns): # Now the rule is that the *first* column painter (usually the service # description) will define the left legend of the matrix. It defines # the set of possible rows. - row_id = tuple(group_value(row, [ painters[0] ])) + row_id = group_value(row, [ painters[0] ]) if row_id not in matrix_cells: unique_row_ids.append(row_id) matrix_cells[row_id] = {}

9 years, 1 month

Check_MK Git: check_mk: Matrix: hilite differences also in header

by Mathias Kettner

Module: check_mk Branch: master Commit: d0f1259d1658a882a3670ff0d7de695821df980d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0f1259d1658a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 11 13:02:48 2015 +0200 Matrix: hilite differences also in header --- web/htdocs/views.css | 7 +++++++ web/plugins/views/layouts.py | 25 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 69a0bc1..e9d9c08 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -423,6 +423,13 @@ table.data.matrix tr.odd0 td.minority { background-color: #dff; } +table.data.matrix tr.even0 td.left.minority { + background-color: #bdd; +} +table.data.matrix tr.odd0 td.left.minority { + background-color: #cee; +} + table.data.single td.gap { background-color: transparent; diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 43cfe49..0b648e0 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -520,7 +520,8 @@ multisite_layouts["table"] = { def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): - majorities = matrix_find_majorities(rows, group_painters, painters) + header_majorities = matrix_find_majorities(rows, group_painters, True) + row_majorities = matrix_find_majorities(rows, painters, False) for groups, unique_row_ids, matrix_cells in \ create_matrices(rows, group_painters, painters, num_columns): @@ -528,12 +529,17 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho # Paint the matrix. Begin with the group headers html.write('<table class="data matrix">') odd = "odd" - for painter in group_painters: + for painter_nr, painter in enumerate(group_painters): odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) html.write('<td class=matrixhead>%s</td>' % painter[0]["title"]) for group, group_row in groups: tdclass, content = prepare_paint(painter, group_row) + if painter_nr > 0: + gv = group_value(group_row, [painter])[0] + majority_value = header_majorities.get(painter_nr-1, None) + if majority_value != None and majority_value != gv: + tdclass += " minority" html.write('<td class="left %s">%s</td>' % (tdclass, content)) html.write("</tr>") @@ -556,7 +562,7 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho for painter_nr, p in enumerate(painters[1:]): tdclass, content = prepare_paint(p, cell_row) gv = group_value(cell_row, [p])[0] - majority_value = majorities[row_id].get(painter_nr, None) + majority_value = row_majorities[row_id].get(painter_nr, None) if majority_value != None and majority_value != gv: tdclass += " minority" if len(painters) > 2: @@ -571,12 +577,14 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho html.write("</table>") -def matrix_find_majorities(rows, group_painters, painters): +def matrix_find_majorities(rows, painters, for_header): counts = {} # dict row_id -> painter_nr -> value -> count for row in rows: - group_id = tuple(group_value(row, group_painters)) - row_id = tuple(group_value(row, [ painters[0] ])) + if for_header: + row_id = None + else: + row_id = tuple(group_value(row, [ painters[0] ])) for painter_nr, painter in enumerate(painters[1:]): value = group_value(row, [painter])[0] row_entry = counts.setdefault(row_id, {}) @@ -600,7 +608,10 @@ def matrix_find_majorities(rows, group_painters, painters): maj_entry[painter_nr] = maj_value - return majorities + if for_header: + return majorities[None] + else: + return majorities # Create list of matrices to render def create_matrices(rows, group_painters, painters, num_columns):

9 years, 1 month

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015