Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3305 FIX cmciii.phase: fixed wrong datatype handling

by Simon Betz

Module: check_mk Branch: master Commit: 862952d6743f186472135834cf31433a1e141ade URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=862952d6743f18… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 22 14:28:29 2016 +0100 3305 FIX cmciii.phase: fixed wrong datatype handling --- .werks/3305 | 10 ++++++++++ ChangeLog | 1 + checks/cmciii | 15 +++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/3305 b/.werks/3305 new file mode 100644 index 0000000..f763fca --- /dev/null +++ b/.werks/3305 @@ -0,0 +1,10 @@ +Title: cmciii.phase: fixed wrong datatype handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458653268 + + diff --git a/ChangeLog b/ChangeLog index 2ef4f4e..6939861 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 3301 FIX: mrpe: Fixed exception "urllib not defined" when using Nagios as core * 3333 FIX: Predictive levels: Improved error handling in case no RRDs have been created yet * 3317 FIX: lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd + * 3305 FIX: cmciii.phase: fixed wrong datatype handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cmciii b/checks/cmciii index 860b261..5300a88 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -868,6 +868,9 @@ def reparse_cmciii_phase(parsed): output.setdefault((unit, device, phase), {}) output[(unit, device, phase)][value_name] = value + + + return output @@ -883,13 +886,17 @@ def check_cmciii_phase(item, params, parsed): parsed = {} parsed[item] = {} - parsed[item]["voltage"] = float(data['Voltage']['Value'].split()[0]), None - parsed[item]["current"] = float(data['Current']['Value'].split()[0]), None - parsed[item]["power"] = float(data[('Power', 'Active')]['Value'].split()[0]), None - parsed[item]["energy"] = float(data[('Energy', 'Active')]['Value'].split()[0]), None + for key, values in data.items(): + if values.get("Value"): + if type(key) == tuple: + phase_key = key[0].lower() + else: + phase_key = key.lower() + parsed[item][phase_key] = float(data[key]['Value'].split()[0]), None return check_elphase(item, params, parsed) + check_info['cmciii.phase'] = { "check_function" : check_cmciii_phase, "inventory_function" : inventory_cmciii_phase,

8 years, 5 months

3106 windows agent: added support for new eventlog types introduced with windows vista / server 2008

by Sebastian Herbord

Module: check_mk Branch: master Commit: 62539435ae22852aa12c4ab8007f90ad9b26445b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62539435ae2285… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 22 14:19:25 2016 +0100 3106 windows agent: added support for new eventlog types introduced with windows vista / server 2008 The new eventlogs introduced in windows vista / windows server 2008 can only be accessed through a new api introduced in that same version. To allow this agent to work with older windows versions, the api used can be toggled through the configuration file and, for compatibilty, defaults to the old style. To enable the new api, set "vista_api = yes" in the logwatch section. This only changes the api, it doesn't automatically enable additional logs (there could be hundreds). Instead you can manually activate the new-style logs with a line like this (again in the logwatch section): "logname Microsoft-Windows-GroupPolicy/Operational = warn" The correct name to use for the logs can be found in windows through the Properties-Window of a log. --- .werks/3106 | 19 + ChangeLog | 1 + agents/windows/Configuration.cc | 11 +- agents/windows/Configuration.h | 4 + agents/windows/EventLog.cc | 300 +++++++++++++--- agents/windows/EventLog.h | 24 +- agents/windows/EventLogVista.cc | 409 ++++++++++++++++++++++ agents/windows/EventLogVista.h | 79 +++++ agents/windows/IEventLog.cc | 40 +++ agents/windows/IEventLog.h | 97 +++++ agents/windows/Makefile | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 14 + agents/windows/check_mk_agent-64.exe | Bin 910336 -> 1003008 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 910336 -> 1003008 bytes agents/windows/check_mk_agent.cc | 343 +++++------------- agents/windows/check_mk_agent.exe | Bin 836096 -> 891392 bytes agents/windows/check_mk_agent.msi | Bin 2007040 -> 2156544 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 836096 -> 891392 bytes agents/windows/dynamic_func.h | 57 +++ agents/windows/install_agent-64.exe | Bin 418513 -> 439059 bytes agents/windows/install_agent.exe | Bin 408949 -> 424770 bytes agents/windows/types.h | 17 +- 23 files changed, 1090 insertions(+), 329 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=62539435ae…

8 years, 5 months

Fixed broken host edit page since yesterday

by Lars Michelsen

Module: check_mk Branch: master Commit: 8426c613fc6ecbf255a07dc4cdef381b4393d3b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8426c613fc6ecb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 22 09:49:54 2016 +0100 Fixed broken host edit page since yesterday --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ffdc7d6..61df313 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1181,7 +1181,7 @@ def mode_edit_host(phase, new, is_cluster): # edit elif not new: - if not Folder.current().has_host(clonename): + if not Folder.current().has_host(hostname): raise MKGeneralException(_("You called this page with an invalid host name.")) mode = "edit" @@ -2597,7 +2597,7 @@ def mode_inventory(phase, firsttime): hostname = html.var("host") host = Folder.current().host(hostname) if not host: - raise MKGeneralException(_("You called this page for a non-existing host.")) + raise MKGeneralException(_("You called this page with an invalid host name.")) host.need_permission("read")

8 years, 5 months

3340 FIX Fixed exception when searching for software package sizes

by Lars Michelsen

Module: check_mk Branch: master Commit: fad21dea920e98b2444bafa9ccad35795dd161e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fad21dea920e98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 17:24:35 2016 +0100 3340 FIX Fixed exception when searching for software package sizes --- .werks/3340 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 16 +++++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/3340 b/.werks/3340 new file mode 100644 index 0000000..1917e8b --- /dev/null +++ b/.werks/3340 @@ -0,0 +1,10 @@ +Title: Fixed exception when searching for software package sizes +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458577459 + + diff --git a/ChangeLog b/ChangeLog index cb2e3b8..fd4ab94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -204,6 +204,7 @@ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone * 3289 FIX: Fixed missing filters in HW-/SW-Inventory views after editing the view... * 3013 FIX: Inventory: snmp inventory plugins never use cached data... + * 3340 FIX: Fixed exception when searching for software package sizes 1.2.8b1: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 3d8a2c6..2daa3b7 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -85,7 +85,7 @@ def declare_inv_column(invpath, datatype, title, short = None): "cmp" : lambda a, b: cmp_inventory_node(a, b, invpath), } - # Declare filter. + # Declare filter. Sync this with declare_invtable_columns() if datatype == "str": visuals.declare_filter(800, visuals.FilterInvText(name, invpath, title)) else: @@ -840,15 +840,23 @@ def declare_invtable_columns(infoname, invpath, topic): render_function_name = "inv_paint_" + paint_name render_function = globals()[render_function_name] else: - paint_name = "text" + paint_name = "str" render_function = None + # Sync this with declare_inv_column() filter_class = hint.get("filter") + if not filter_class: + if paint_name == "str": + filter_class = visuals.FilterInvtableText + else: + filter_class = visuals.FilterInvtableIDRange + declare_invtable_column(infoname, name, topic, hint["title"], hint.get("short", hint["title"]), sortfunc, render_function, filter_class) -def declare_invtable_column(infoname, name, topic, title, short_title, sortfunc, render_func, filter_class): +def declare_invtable_column(infoname, name, topic, title, short_title, + sortfunc, render_func, filter_class): column = infoname + "_" + name if render_func == None: paint = lambda row: ("", "%s" % row.get(column)) @@ -872,8 +880,6 @@ def declare_invtable_column(infoname, name, topic, title, short_title, sortfunc, "cmp" : lambda a, b: sortfunc(a.get(column), b.get(column)) } - if filter_class == None: - filter_class = visuals.FilterInvtableText visuals.declare_filter(800, filter_class(infoname, name, topic + ": " + title))

8 years, 6 months

3317 FIX lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/ null is missing after popd

by Mathias Kettner

Module: check_mk Branch: master Commit: 80717a1631bb8791ac32cf9141d79a099811ffef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80717a1631bb87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 17:21:03 2016 +0100 3317 FIX lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd --- .werks/3317 | 10 ++++++++++ ChangeLog | 1 + checks/lnx_bonding | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3317 b/.werks/3317 new file mode 100644 index 0000000..c46b4ba --- /dev/null +++ b/.werks/3317 @@ -0,0 +1,10 @@ +Title: lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458577244 + + diff --git a/ChangeLog b/ChangeLog index e817f01..cb2e3b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * 3300 FIX: zfsget: Fixed excluding snapshots from zfsget section * 3301 FIX: mrpe: Fixed exception "urllib not defined" when using Nagios as core * 3333 FIX: Predictive levels: Improved error handling in case no RRDs have been created yet + * 3317 FIX: lnx_bonding: handle bogus output of 1.2.6 agents where >/dev/null is missing after popd Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/lnx_bonding b/checks/lnx_bonding index ffdfa86..810aadf 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -56,7 +56,12 @@ # Permanent HW addr: 00:26:b9:7d:89:2e def parse_lnx_bonding(info): - lines = iter(info) + def strip_popd_garbage(info): + for line in info: + if len(line) != 1 or not line[0].startswith("/"): + yield line + + lines = strip_popd_garbage(info) bonds = {} # Skip header with bonding version

8 years, 6 months

3339 FIX Fixed exception on "Aggregations Affected by Service"

by Lars Michelsen

page when no host/service given Message-ID: <56f017fe.Lt8PRaGSjE3vDNfX%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: ab72858e857dc232d5cc92b5660a6506e94ec1ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab72858e857dc2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 16:49:11 2016 +0100 3339 FIX Fixed exception on "Aggregations Affected by Service" page when no host/service given --- .werks/3339 | 10 ++++++++++ ChangeLog | 1 + web/plugins/visuals/bi.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3339 b/.werks/3339 new file mode 100644 index 0000000..8f929ec --- /dev/null +++ b/.werks/3339 @@ -0,0 +1,10 @@ +Title: Fixed exception on "Aggregations Affected by Service" page when no host/service given +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458575328 + + diff --git a/ChangeLog b/ChangeLog index 208bba8..e817f01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 3315 FIX: Builtin icon visibility now can be correctly reset... * 3336 FIX: Fixed possible crash on werk list page... * 3337 FIX: Improved error handling of invalid perfdata in the GUI + * 3339 FIX: Fixed exception on "Aggregations Affected by Service" page when no host/service given WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index b2e5ed0..d565093 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -140,7 +140,8 @@ class BIServiceFilter(Filter): html.text_input(self.htmlvars[2]) def heading_info(self): - return html.get_unicode_input(self.htmlvars[1]) + " / " + html.get_unicode_input(self.htmlvars[2]) + return html.get_unicode_input(self.htmlvars[1], "") \ + + " / " + html.get_unicode_input(self.htmlvars[2], "") def service_spec(self): if html.has_var(self.htmlvars[2]):

8 years, 6 months

3338 FIX Improved error handling when host to be edited does not exist

by Lars Michelsen

Module: check_mk Branch: master Commit: a28b14611dcb16efaaecc0425911b03897ab505d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a28b14611dcb16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 16:37:26 2016 +0100 3338 FIX Improved error handling when host to be edited does not exist --- .werks/3338 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3338 b/.werks/3338 new file mode 100644 index 0000000..ce91d87 --- /dev/null +++ b/.werks/3338 @@ -0,0 +1,10 @@ +Title: Improved error handling when host to be edited does not exist +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458574630 + + diff --git a/ChangeLog b/ChangeLog index c10db31..208bba8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,7 @@ * 3314 FIX: Correctly add custom user attribute values after change in attribute declaration... * 3316 FIX: Fix validation of empty or missing file uploads (such as in Bulk host import) * 3302 FIX: Improved error handling when trying to edit a not existing rule + * 3338 FIX: Improved error handling when host to be edited does not exist Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 02b4dcc..ffdc7d6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1180,7 +1180,10 @@ def mode_edit_host(phase, new, is_cluster): is_cluster = host.is_cluster() # edit - elif not new and Folder.current().has_host(hostname): + elif not new: + if not Folder.current().has_host(clonename): + raise MKGeneralException(_("You called this page with an invalid host name.")) + mode = "edit" title = _("Properties of host") + " " + hostname host = Folder.current().host(hostname)

8 years, 6 months

3337 FIX Improved error handling of invalid perfdata in the GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: e1ae2035b396c525bf6a091c84c8594a50f7c829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1ae2035b396c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 16:23:42 2016 +0100 3337 FIX Improved error handling of invalid perfdata in the GUI --- .werks/3337 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/metrics.py | 21 +++++++++++++++------ web/plugins/views/painters.py | 10 ++++++++-- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.werks/3337 b/.werks/3337 new file mode 100644 index 0000000..ceec461 --- /dev/null +++ b/.werks/3337 @@ -0,0 +1,10 @@ +Title: Improved error handling of invalid perfdata in the GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458573804 + + diff --git a/ChangeLog b/ChangeLog index 188325f..c10db31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 3313 FIX: Set correct mime type when exporting CSV and other non-HTML formats * 3315 FIX: Builtin icon visibility now can be correctly reset... * 3336 FIX: Fixed possible crash on werk list page... + * 3337 FIX: Improved error handling of invalid perfdata in the GUI WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 2403fc0..c6fd8a5 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -309,6 +309,9 @@ def split_perf_data(perf_data_string): # Convert perf_data_string into perf_data, extract check_command +# This methods must not return None or anything else. It mustr strictly +# return a tuple of perf_data list and the check_command. In case of +# errors during parsing it returns an empty list for the perf_data. def parse_perf_data(perf_data_string, check_command=None): # Strip away arguments like in "check_http!-H mathias-kettner.de" # FIXME: check_command=None? Fails here! @@ -322,7 +325,7 @@ def parse_perf_data(perf_data_string, check_command=None): parts = split_perf_data(perf_data_string) except ValueError, e: html.log("Failed to parse perfdata string: %s" % perf_data_string) - return None, check_command + return [], check_command # Try if check command is appended to performance data # in a PNP like style @@ -351,16 +354,18 @@ def parse_perf_data(perf_data_string, check_command=None): # separate value from unit i = 0 - while i < len(value_text) and (isdigit(value_text[i]) or value_text[i] in ['.', ',', '-']): + while i < len(value_text) and (isdigit(value_text[i]) + or value_text[i] in ['.', ',', '-']): i += 1 + unit_name = value_text[i:] - value = value_text[:i] + value = float_or_int(value_text[:i]) perf_data.append((varname, value, unit_name, warn, crit, min, max)) except: + html.log("Failed to parse perfdata: %s" % perf_data_string) if config.debug: raise - perf_data = None return perf_data, check_command @@ -388,6 +393,10 @@ def perfvar_translation(perfvar_nr, perfvar_name, check_command): } +def translate_perf_data(perf_data_string, check_command=None): + perf_data, check_command = parse_perf_data(perf_data_string, check_command) + return translate_metrics(perf_data, check_command) + # Convert Ascii-based performance data as output from a check plugin # into floating point numbers, do scaling if neccessary. @@ -399,7 +408,7 @@ def translate_metrics(perf_data, check_command): color_index = 0 for nr, entry in enumerate(perf_data): varname = entry[0] - value_text = entry[1] + value = entry[1] translation_entry = perfvar_translation(nr, varname, check_command) metric_name = translation_entry["name"] @@ -420,7 +429,7 @@ def translate_metrics(perf_data, check_command): mi["color"] = parse_color_into_hexrgb(mi["color"]) new_entry = { - "value" : float_or_int(value_text) * translation_entry["scale"], + "value" : value * translation_entry["scale"], "orig_name" : varname, "scale" : translation_entry["scale"], # needed for graph definitions "scalar" : {}, diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1daba9a..af517e9 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -586,8 +586,14 @@ multisite_painters["svc_perf_data"] = { } def paint_service_metrics(row): - translated_metrics = metrics.translate_metrics(*metrics.parse_perf_data(row["service_perf_data"], row["service_check_command"])) - return "", metrics.render_metrics_table(translated_metrics, row["host_name"], row["service_description"]) + translated_metrics = metrics.translate_perf_data(row["service_perf_data"], + row["service_check_command"]) + + if row["service_perf_data"] and not translated_metrics: + return "", _("Failed to parse performance data string: %s") % row["service_perf_data"] + + return "", metrics.render_metrics_table(translated_metrics, row["host_name"], + row["service_description"]) multisite_painters["svc_metrics"] = { "title" : _("Service Metrics"),

8 years, 6 months

Fix styling of graph reload pause

by Mathias Kettner

Module: check_mk Branch: master Commit: d5c5dc8e5e2a924eb8b298a5135406a08d1f8824 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5c5dc8e5e2a92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 16:08:38 2016 +0100 Fix styling of graph reload pause --- web/htdocs/js/checkmk.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 149da71..9867d67 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1220,6 +1220,8 @@ function draw_reload_pause_overlay(seconds) p2.className = "pause_bar p2"; container.appendChild(p2); + container.appendChild(document.createElement("br")); + var counter = document.createElement("a"); counter.setAttribute("id", "reload_pause_counter"); // FIXME: Localize

8 years, 6 months

3336 FIX Fixed possible crash on werk list page

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d62f167a846cedd2f438acca071145f8e6e2cda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d62f167a846ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 15:19:43 2016 +0100 3336 FIX Fixed possible crash on werk list page SyntaxError (unexpected EOF while parsing (unknown, line 0)) --- .werks/3336 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/werks.py | 8 +++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/3336 b/.werks/3336 new file mode 100644 index 0000000..46198b7 --- /dev/null +++ b/.werks/3336 @@ -0,0 +1,10 @@ +Title: Fixed possible crash on werk list page +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458569944 + +SyntaxError (unexpected EOF while parsing (unknown, line 0)) diff --git a/ChangeLog b/ChangeLog index 33aff24..188325f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 3294 FIX: Fixed mixed languages when some users have localized GUI and some not... * 3313 FIX: Set correct mime type when exporting CSV and other non-HTML formats * 3315 FIX: Builtin icon visibility now can be correctly reset... + * 3336 FIX: Fixed possible crash on werk list page... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index f203530..8363ace 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -230,9 +230,11 @@ def load_werk(path): def load_acknowledgements(): if os.path.exists(acknowledgement_path): - return literal_eval(file(acknowledgement_path).read()) - else: - return [] + content = file(acknowledgement_path).read().strip() + if content: + return literal_eval(file(acknowledgement_path).read()) + + return [] def unacknowledged_incompatible_werks():

8 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016