Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3387 FIX ps: Fixed crash during service discovery on AIX hosts having defunct processes

by Lars Michelsen

Module: check_mk Branch: master Commit: d592bf2ef9773608d800f6ffb1a269a983495707 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d592bf2ef97736… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 15:39:36 2016 +0200 3387 FIX ps: Fixed crash during service discovery on AIX hosts having defunct processes --- .werks/3387 | 10 ++++++++++ ChangeLog | 1 + checks/ps.include | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/3387 b/.werks/3387 new file mode 100644 index 0000000..2463950 --- /dev/null +++ b/.werks/3387 @@ -0,0 +1,10 @@ +Title: ps: Fixed crash during service discovery on AIX hosts having defunct processes +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461073126 + + diff --git a/ChangeLog b/ChangeLog index c382827..dafbd35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,6 +162,7 @@ * 3400 FIX: local: do not crash in P mode if performance data contains a unit of measurement * 3386 FIX: AIX agent: Cached local scripts / plugins need to be configured in seconds... NOTE: Please refer to the migration notes! + * 3387 FIX: ps: Fixed crash during service discovery on AIX hosts having defunct processes Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ps.include b/checks/ps.include index 98093aa..45748f8 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -185,7 +185,11 @@ def process_matches_for_discovery(process_line, process_pattern, userspec): if matchobject: return [ g and g or "" for g in matchobject.groups() ], grabbed_user else: - if command_line[0] == process_pattern: + # command_line can be empty. Found in AIX agent output (server-aix-ps-1): + # ... + # (<defunct>,,,) + # ... + if command_line and command_line[0] == process_pattern: return (), grabbed_user return False, grabbed_user

8 years, 2 months

Updated bug entries #2486

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b2e57a4cd3bd4907bff5f3c6993c078fea256cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b2e57a4cd3bd4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 15:30:00 2016 +0200 Updated bug entries #2486 --- .bugs/2486 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2486 b/.bugs/2486 index e5f990f..aaac60e 100644 --- a/.bugs/2486 +++ b/.bugs/2486 @@ -1,9 +1,12 @@ Title: Availablity: visual levels do check themselves when working with annotations Component: multisite -State: open +Class: bug +State: done Date: 2016-04-07 16:49:26 Targetversion: 1.2.8 -Class: bug As ist seems if you edit annotations or stuff like that then suddenly the visual levels for availability are activated. Is this a name clash in an HTML variable? + +2016-04-19 15:29:58: changed state open -> done +Fixed.

8 years, 2 months

3415 FIX Availability option "Visual levels for the availability" not longer enables itself

by Mathias Kettner

Module: check_mk Branch: master Commit: 8ba5e54da67dcf4f285b2bfb3832e262617c9ff5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ba5e54da67dcf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 15:29:18 2016 +0200 3415 FIX Availability option "Visual levels for the availability" not longer enables itself When you edited an annotation then this option might enable itself. This has been fixed. --- .werks/3415 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3415 b/.werks/3415 new file mode 100644 index 0000000..0fd22b1 --- /dev/null +++ b/.werks/3415 @@ -0,0 +1,10 @@ +Title: Availability option "Visual levels for the availability" not longer enables itself +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461072458 + +When you edited an annotation then this option might enable itself. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 6cf9fc1..c382827 100644 --- a/ChangeLog +++ b/ChangeLog @@ -310,6 +310,7 @@ * 3331 FIX: Availability: avoid duplication of annotation when changing time while editing * 3332 FIX: Avoid falling back to annotation edit form when reloading page directly after editing * 3393 FIX: Availability annotations: also show annotations for hosts when showing services + * 3415 FIX: Availability option "Visual levels for the availability" not longer enables itself... Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cc27f80..1bd034a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2524,7 +2524,8 @@ class Optional(ValueSpec): return self._valuespec.value_to_text(value) def from_html_vars(self, varprefix): - if html.get_checkbox(varprefix + "_use") != self._negate: + checkbox_checked = html.get_checkbox(varprefix + "_use") == True # not None or False + if checkbox_checked != self._negate: return self._valuespec.from_html_vars(varprefix + "_value") else: return self._none_value

8 years, 2 months

Small internal cleanup needed for other fix

by Lars Michelsen

Module: check_mk Branch: master Commit: 3626f100247fb33047d262162b443f933856ae5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3626f100247fb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 15:11:37 2016 +0200 Small internal cleanup needed for other fix --- web/htdocs/pagetypes.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index a3f170a..2d51615 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -346,14 +346,20 @@ class PageRenderer(Base): # Most important: page for showing the page ;-) @classmethod - def page_show(self): - name = html.var(self.ident_attr()) - self.load() - page = self.find_page(name) + def page_show(cls): + page = cls.requested_page() + page.render() + + + @classmethod + def requested_page(cls): + name = html.var(cls.ident_attr()) + cls.load() + page = cls.find_page(name) if not page: raise MKGeneralException(_("Cannot find %s with the name %s") % ( - self.phrase("title"), name)) - page.render() + cls.phrase("title"), name)) + return page # Links for the sidebar

8 years, 2 months

Updated bug entries #0858

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c9b860bc1d8744348e2c90befadc3e019023c30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c9b860bc1d874… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 14:21:00 2016 +0200 Updated bug entries #0858 --- .bugs/858 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/858 b/.bugs/858 index cfa8d34..71d916a 100644 --- a/.bugs/858 +++ b/.bugs/858 @@ -1,11 +1,14 @@ Title: Discovery check sometimes does not detect config changes Component: checks -State: open +Class: bug +State: done Date: 2016-02-09 15:25:38 Targetversion: 1.2.8 -Class: bug After changing a rule like diskstat Discovery mode and doing a rediscovery every seems fine. But some times later the Check_MK Discovery Check reports unchecked services. But if you then reschedule the Discovery Service manually, everything is fine again + +2016-04-19 14:20:59: changed state open -> done +Should work now.

8 years, 2 months

3414 New declarator BINARY(...) for OIDs - returning a list of byte values

by Mathias Kettner

Module: check_mk Branch: master Commit: e0f340a916f8eca0a9f49b5a5083a374e689c3f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0f340a916f8ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 13:53:42 2016 +0200 3414 New declarator BINARY(...) for OIDs - returning a list of byte values When declaring OIDs in SNMP based checks you can now include the OID into <tt>BINARY</tt>. This will then create a list of bytes instead of a string. E.g. <tt>BINARY('5')</tt> will fetch the end OID 5 and convert the string values into lists of bytes, into <tt>[0, 33, 85, 10, 7, 186]</tt> instead of <tt>'\x00!U\n\x07\xba'</tt>. This allows to tackle a problem with the new version 1.2.8 that otherwise automatically interpretes all strings as UTF-8. --- .werks/3414 | 16 ++++++++++++++++ ChangeLog | 1 + checks/if.include | 6 +++++- checks/if64.include | 2 +- modules/snmp.py | 45 ++++++++++++++++++++++++++++++--------------- 5 files changed, 53 insertions(+), 17 deletions(-) diff --git a/.werks/3414 b/.werks/3414 new file mode 100644 index 0000000..60fc8bf --- /dev/null +++ b/.werks/3414 @@ -0,0 +1,16 @@ +Title: New declarator BINARY(...) for OIDs - returning a list of byte values +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461066639 + +When declaring OIDs in SNMP based checks you can now include the OID +into <tt>BINARY</tt>. This will then create a list of bytes instead of a +string. E.g. <tt>BINARY('5')</tt> will fetch the end OID 5 and convert the +string values into lists of bytes, into <tt>[0, 33, 85, 10, 7, 186]</tt> +instead of <tt>'\x00!U\n\x07\xba'</tt>. This allows to tackle a problem with +the new version 1.2.8 that otherwise automatically interpretes all strings +as UTF-8. diff --git a/ChangeLog b/ChangeLog index 2ad53e3..6cf9fc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 3411 mysql_slave: now max time and related state can be configured if slave-IO and slave-SQL are not running * 3412 stulz_temp: now has readable sensor names and discovers all possible sensors which are connected NOTE: Please refer to the migration notes! + * 3414 New declarator BINARY(...) for OIDs - returning a list of byte values... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/if.include b/checks/if.include index c99ce37..2a056a5 100644 --- a/checks/if.include +++ b/checks/if.include @@ -689,7 +689,11 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, if ifPhysAddress: - mac = ":".join(["%02s" % hex(ord(m))[2:] for m in ifPhysAddress]).replace(' ', '0') + if type(ifPhysAddress) != list: + mac_bytes = map(ord, ifPhysAddress) + else: + mac_bytes = ifPhysAddress + mac = ":".join(["%02s" % hex(m)[2:] for m in mac_bytes]).replace(' ', '0') infotext += 'MAC: %s, ' % mac # Check speed settings of interface, but only if speed information diff --git a/checks/if64.include b/checks/if64.include index 4f202ec..cfa27d5 100644 --- a/checks/if64.include +++ b/checks/if64.include @@ -85,5 +85,5 @@ if64_snmp_end_oids = [ "2.2.1.20", # ifOutErrors 16 "2.2.1.21", # ifOutQLen 17 "31.1.1.1.18", # ifAlias 18 - "2.2.1.6", # ifPhysAddress 19 + BINARY("2.2.1.6"), # ifPhysAddress 19 ] diff --git a/modules/snmp.py b/modules/snmp.py index f7815f5..42532b1 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -40,6 +40,10 @@ def CACHED_OID(oid): return "cached", oid +def BINARY(oid): + return "binary", oid + + def strip_snmp_value(value, hex_plain = False): v = value.strip() if v.startswith('"'): @@ -137,7 +141,7 @@ def get_snmp_table(hostname, ip, check_type, oid_info, use_snmpwalk_cache): max_len_col = -1 for column in targetcolumns: - fetchoid = compute_fetch_oid(oid, suboid, column) + fetchoid, value_encoding = compute_fetch_oid(oid, suboid, column) # column may be integer or string like "1.5.4.2.3" colno += 1 @@ -152,13 +156,13 @@ def get_snmp_table(hostname, ip, check_type, oid_info, use_snmpwalk_cache): raise MKGeneralException("Invalid SNMP OID specification in implementation of check. " "You can only use one of OID_END, OID_STRING, OID_BIN, OID_END_BIN and OID_END_OCTET_STRING.") index_column = colno - columns.append((fetchoid, [])) + columns.append((fetchoid, [], "string")) index_format = column continue rowinfo = get_snmpwalk(hostname, ip, check_type, oid, fetchoid, column, use_snmpwalk_cache) - columns.append((fetchoid, rowinfo)) + columns.append((fetchoid, rowinfo, value_encoding)) number_of_rows = len(rowinfo) if number_of_rows > max_len: max_len = number_of_rows @@ -167,7 +171,7 @@ def get_snmp_table(hostname, ip, check_type, oid_info, use_snmpwalk_cache): if index_column != -1: index_rows = [] # Take end-oids of non-index columns as indices - fetchoid, max_column = columns[max_len_col] + fetchoid, max_column, value_encoding = columns[max_len_col] for o, value in max_column: if index_format == OID_END: index_rows.append((o, extract_end_oid(fetchoid, o))) @@ -180,16 +184,16 @@ def get_snmp_table(hostname, ip, check_type, oid_info, use_snmpwalk_cache): else: # OID_END_OCTET_STRING: index_rows.append((o, oid_to_bin(extract_end_oid(fetchoid, o))[1:])) - columns[index_column] = fetchoid, index_rows + columns[index_column] = fetchoid, index_rows, value_encoding # prepend suboid to first column if suboid and columns: - fetchoid, first_column = columns[0] + fetchoid, first_column, value_encoding = columns[0] new_first_column = [] for o, val in first_column: new_first_column.append((o, str(suboid) + "." + str(val))) - columns[0] = fetchoid, new_first_column + columns[0] = fetchoid, new_first_column, value_encoding # Here we have to deal with a nasty problem: Some brain-dead devices # omit entries in some sub OIDs. This happens e.g. for CISCO 3650 @@ -200,9 +204,9 @@ def get_snmp_table(hostname, ip, check_type, oid_info, use_snmpwalk_cache): # From all SNMP data sources (stored walk, classic SNMP, inline SNMP) we # get normal python strings. But for Check_MK we need unicode strings now. # Convert them by using the standard Check_MK approach for incoming data - new_columns = sanitize_snmp_encoding(new_columns) + sanitized_columns = sanitize_snmp_encoding(new_columns) - info += construct_snmp_table_of_rows(new_columns) + info += construct_snmp_table_of_rows(sanitized_columns) return info @@ -261,6 +265,7 @@ def perform_snmpwalk(hostname, ip, check_type, base_oid, fetchoid): def compute_fetch_oid(oid, suboid, column): fetchoid = oid + value_encoding = "string" if suboid: fetchoid += "." + str(suboid) @@ -268,15 +273,20 @@ def compute_fetch_oid(oid, suboid, column): if column != "": if type(column) == tuple: fetchoid += "." + str(column[1]) + if column[0] == "binary": + value_encoding = "binary" else: fetchoid += "." + str(column) - return fetchoid + return fetchoid, value_encoding def sanitize_snmp_encoding(columns): - for index, column in enumerate(columns): - columns[index] = map(snmp_decode_string, column) + for index, (column, value_encoding) in enumerate(columns): + if value_encoding == "string": + columns[index] = map(snmp_decode_string, column) + else: + columns[index] = map(snmp_decode_binary, column) return columns @@ -284,7 +294,7 @@ def sanitize_snmp_table_columns(columns): # First compute the complete list of end-oids appearing in the output # by looping all results and putting the endoids to a flat list endoids = [] - for fetchoid, column in columns: + for fetchoid, column, value_encoding in columns: for o, value in column: endoid = extract_end_oid(fetchoid, o) if endoid not in endoids: @@ -300,7 +310,7 @@ def sanitize_snmp_table_columns(columns): # Now fill gaps in columns where some endois are missing new_columns = [] - for fetchoid, column in columns: + for fetchoid, column, value_encoding in columns: # It might happen that end OIDs are not ordered. Fix the OID sorting to make # it comparable to the already sorted endoids list. Otherwise we would get # some mixups when filling gaps @@ -325,7 +335,7 @@ def sanitize_snmp_table_columns(columns): while i < len(endoids): new_column.append("") # (beginoid + '.' +endoids[i], "") ) i += 1 - new_columns.append(new_column) + new_columns.append((new_column, value_encoding)) return new_columns @@ -540,6 +550,11 @@ def snmp_decode_string(text): except: return text.decode('latin1') + +def snmp_decode_binary(text): + return map(ord, text) + + # .--Classic SNMP--------------------------------------------------------. # | ____ _ _ ____ _ _ __ __ ____ | # | / ___| | __ _ ___ ___(_) ___ / ___|| \ | | \/ | _ \ |

8 years, 2 months

3029 FIX rule editor icon: fixed query of invalid livestatus column

by Andreas Boesl

Module: check_mk Branch: master Commit: 523fe6b7f72e0652f47b528fd4a5413fd9819612 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=523fe6b7f72e06… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 19 13:41:23 2016 +0200 3029 FIX rule editor icon: fixed query of invalid livestatus column The cmc.log file regularly showed <i>"Replacing non-existing column 'host_host_name' with null column"</i> whenever a multisite page with icons was shown. Most of the time it had no effect and did not brake anything, because the correct data was already queried through an other function. Nevertheless, this bug has been fixed. --- .werks/3029 | 11 +++++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3029 b/.werks/3029 new file mode 100644 index 0000000..cb6c8d5 --- /dev/null +++ b/.werks/3029 @@ -0,0 +1,11 @@ +Title: rule editor icon: fixed query of invalid livestatus column +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1461065867 +Class: fix + +The cmc.log file regularly showed <i>"Replacing non-existing column 'host_host_name' with null column"</i> +whenever a multisite page with icons was shown. Most of the time it had no effect and did not brake anything, +because the correct data was already queried through an other function. Nevertheless, this bug has been fixed. diff --git a/ChangeLog b/ChangeLog index 1424068..2ad53e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -217,6 +217,7 @@ * 3401 FIX: Fix sorting and grouping hosts by their IPv4 address * 3402 FIX: Using information from inventory in column tooltips now longer crashes * 3413 FIX: Correctly display non-Ascii-characters in host tag values in host tag filter + * 3029 FIX: rule editor icon: fixed query of invalid livestatus column... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 29e84c7..93ed044 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -198,7 +198,8 @@ def paint_rule_editor(what, row, tags, host_custom_vars): return 'rulesets', title, html.makeuri_contextless(urlvars, "wato.py") multisite_icons_and_actions['rule_editor'] = { - 'columns': [ 'check_type', "host_name" ], + 'columns': [ 'check_type' ], + 'host_columns' : [ 'name' ], 'service_columns': [ 'description' ], 'paint': paint_rule_editor, }

8 years, 2 months

fixed stulz_temp if reading is 999

by Simon Betz

Module: check_mk Branch: master Commit: a4e1597d4337f1a987674f8a34b155a196081d48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4e1597d4337f1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 19 13:32:47 2016 +0200 fixed stulz_temp if reading is 999 --- checks/stulz_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/stulz_temp b/checks/stulz_temp index ef8f7cb..e2cefab 100644 --- a/checks/stulz_temp +++ b/checks/stulz_temp @@ -77,7 +77,7 @@ def parse_stulz_temp(info): oids = oidend.split(".") temp_ty = oids[0] index = oids[2] - if temp_ty in map_types: + if temp_ty in map_types and reading_str != "999": itemname = "%s-%s" % (map_types[temp_ty], index) parsed.setdefault(itemname, float(reading_str)/10)

8 years, 2 months

Fix exception introduced today in tooltip inventory fix

by Mathias Kettner

Module: check_mk Branch: master Commit: ead61c092057f51b6679c02e9e184daef2d2b1da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ead61c092057f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 13:25:00 2016 +0200 Fix exception introduced today in tooltip inventory fix --- web/htdocs/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 78d201b..71de7d2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1074,10 +1074,10 @@ def show_view(view, show_heading = False, show_buttons = True, # Inventory data needed in any of the tool tips for painter in master_painters: - tooltip_painter_name = painter[2] - if tooltip_painter_name: - if tooltip_painter_name.startswith("inv_"): - need_inventory_data = True + if len(painter) > 2: + tooltip_painter_name = painter[2] + if tooltip_painter_name and tooltip_painter_name.startswith("inv_"): + need_inventory_data = True # Columns needed for sorters for s in sorters:

8 years, 2 months

3413 FIX Correctly display non-Ascii-characters in host tag values in host tag filter

by Mathias Kettner

Module: check_mk Branch: master Commit: ceee3883e117c9c3e4469a35a00982b4a268fcba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ceee3883e117c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 12:08:11 2016 +0200 3413 FIX Correctly display non-Ascii-characters in host tag values in host tag filter --- .werks/3413 | 10 ++++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/3413 b/.werks/3413 new file mode 100644 index 0000000..ded33aa --- /dev/null +++ b/.werks/3413 @@ -0,0 +1,10 @@ +Title: Correctly display non-Ascii-characters in host tag values in host tag filter +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461060469 + + diff --git a/ChangeLog b/ChangeLog index bd461ca..1424068 100644 --- a/ChangeLog +++ b/ChangeLog @@ -216,6 +216,7 @@ * 3398 FIX: Fix exception in Matrix layout if it contains certain complex columns * 3401 FIX: Fix sorting and grouping hosts by their IPv4 address * 3402 FIX: Using information from inventory in column tooltips now longer crashes + * 3413 FIX: Correctly display non-Ascii-characters in host tag values in host tag filter WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 0e1325a..b1ee985 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1007,11 +1007,11 @@ class FilterHostTags(Filter): if tag is None: tag = '' - if type(title) == unicode: - title = title.encode("utf-8") + # if type(title) == unicode: + # title = title.encode("utf-8") grouped[entry[0]].append([tag, title]) - html.javascript('g_hosttag_groups = %r;' % grouped) + html.javascript('g_hosttag_groups = %s;' % json.dumps(grouped)) html.write('<table>') for num in range(self.count): prefix = 'host_tag_%d' % num

8 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016