Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #2084 FIX Disabled notification for a user is now shown on profile page even when not permitted to edit

by Lars Michelsen

Module: check_mk Branch: master Commit: 3382452c32c9c5015940575dff2017ce3d11fa2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3382452c32c9c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 2 15:10:58 2015 +0100 #2084 FIX Disabled notification for a user is now shown on profile page even when not permitted to edit When all notifications have been disabled for a user this is shown on the user profile page and user edit page even when the user is not able to edit this value. The locking / disabled notification state is shown in the WATOs user list as icons now. --- .werks/2084 | 13 +++++++++++ ChangeLog | 1 + web/htdocs/images/icon_user_locked.png | Bin 0 -> 4520 bytes web/htdocs/wato.py | 39 ++++++++++++++++++-------------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/.werks/2084 b/.werks/2084 new file mode 100644 index 0000000..2a12942 --- /dev/null +++ b/.werks/2084 @@ -0,0 +1,13 @@ +Title: Disabled notification for a user is now shown on profile page even when not permitted to edit +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425305351 + +When all notifications have been disabled for a user this is shown on the user profile page +and user edit page even when the user is not able to edit this value. + +The locking / disabled notification state is shown in the WATOs user list as icons now. diff --git a/ChangeLog b/ChangeLog index 7426576..75306f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -303,6 +303,7 @@ * 2026 FIX: Fixed exception when using umlauts in notification plugin descriptions... * 2078 FIX: Fixed exception with some snapshots when using a localized GUI... * 2080 FIX: Fixed UnicodeDecodeError when using a localized GUI on notification configuration page + * 2084 FIX: Disabled notification for a user is now shown on profile page even when not permitted to edit... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/images/icon_user_locked.png b/web/htdocs/images/icon_user_locked.png new file mode 100644 index 0000000..67f53d8 Binary files /dev/null and b/web/htdocs/images/icon_user_locked.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e350dac..4f96048 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11787,9 +11787,12 @@ def mode_users(phase): auth_method = "<i>%s</i>" % _("none") table.cell(_("Authentication"), auth_method) - # Locked + table.cell(_("State")) locked = user.get("locked", False) - table.cell(_("Locked"), (locked and ("<b>" + _("yes") + "</b>") or _("no"))) + if user.get("locked", False): + html.icon(_('The login is currently locked'), 'user_locked') + if user.get("disable_notifications", False): + html.icon(_('Notifications are disabled'), 'notif_disabled') # Full name / Alias table.cell(_("Alias"), user.get("alias", "")) @@ -11894,18 +11897,17 @@ def mode_edit_user(phase): if topic is not None and topic != attr['topic']: continue # skip attrs of other topics - if not userid or not attr.get("permission") or config.user_may(userid, attr["permission"]): - vs = attr['valuespec'] - forms.section(_u(vs.title())) - if attr['user_editable'] and not is_locked(name): - vs.render_input("ua_" + name, user.get(name, vs.default_value())) - else: - html.write(vs.value_to_text(user.get(name, vs.default_value()))) - # Render hidden to have the values kept after saving - html.write('<div style="display:none">') - vs.render_input("ua_" + name, user.get(name, vs.default_value())) - html.write('</div>') - html.help(_u(vs.help())) + vs = attr['valuespec'] + forms.section(_u(vs.title())) + if attr['user_editable'] and not is_locked(name): + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + else: + html.write(vs.value_to_text(user.get(name, vs.default_value()))) + # Render hidden to have the values kept after saving + html.write('<div style="display:none">') + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + html.write('</div>') + html.help(_u(vs.help())) # Load data that is referenced - in order to display dropdown # boxes and to check for validity. @@ -15959,11 +15961,14 @@ def page_user_profile(change_pw=False): if config.may('general.edit_user_attributes'): for name, attr in userdb.get_user_attributes(): if attr['user_editable']: + vs = attr['valuespec'] + forms.section(_u(vs.title())) + value = user.get(name, vs.default_value()) if not attr.get("permission") or config.may(attr["permission"]): - vs = attr['valuespec'] - forms.section(_u(vs.title())) - vs.render_input("ua_" + name, user.get(name, vs.default_value())) + vs.render_input("ua_" + name, value) html.help(_u(vs.help())) + else: + html.write(vs.value_to_text(value)) # Save button forms.end()

9 years, 7 months

Check_MK Git: check_mk: Another minor cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 1a53743280bbb50d189b99606843ec8bee36132e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a53743280bbb5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 2 14:26:57 2015 +0100 Another minor cleanup --- web/plugins/wato/check_parameters.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7ca95a1..9f74ac8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2987,7 +2987,7 @@ register_check_parameters( ) register_check_parameters( - subgroup_networking, + subgroup_os, "memory_simple", _("Main memory usage of simple devices"), Transform( @@ -2998,20 +2998,20 @@ register_check_parameters( title = _("Levels for memory usage"), choices = [ ( "perc_used", - _("Percentual levels for used memory"), - Tuple( - elements = [ - Percentage(title = _("Warning at a memory usage of"), default_value = 80.0, maxvalue = None), - Percentage(title = _("Critical at a memory usage of"), default_value = 90.0, maxvalue = None) - ] + _("Percentual levels for used memory"), + Tuple( + elements = [ + Percentage(title = _("Warning at a memory usage of"), default_value = 80.0, maxvalue = None), + Percentage(title = _("Critical at a memory usage of"), default_value = 90.0, maxvalue = None) + ] )), ( "abs_free", - _("Absolute levels for free memory"), - Tuple( - elements = [ - Filesize(title = _("Warning below")), - Filesize(title = _("Critical below")) - ] + _("Absolute levels for free memory"), + Tuple( + elements = [ + Filesize(title = _("Warning below")), + Filesize(title = _("Critical below")) + ] )), ( "ignore", _("Do not impose levels")), ]) @@ -3019,11 +3019,14 @@ register_check_parameters( ], optional_keys = [], ), + # Convert default levels from discovered checks forth = lambda v: type(v) != dict and { "levels" : ( "perc_used", v) } or v, ), TextAscii( - title = _("Module name"), - allow_empty = False + title = _("Module name or empty"), + help = _("Leave this empty for systems without modules, which just " + "have one global memory usage."), + allow_empty = True, ), "dict", )

9 years, 7 months

Check_MK Git: check_mk: hp_procurve_mem: minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: f105dea29fa9132bd7f91b7f566762d034722dab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f105dea29fa913… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 2 14:22:41 2015 +0100 hp_procurve_mem: minor code cleanup --- checks/hp_procurve_mem | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/checks/hp_procurve_mem b/checks/hp_procurve_mem index 47db1fd..0ea0aeb 100644 --- a/checks/hp_procurve_mem +++ b/checks/hp_procurve_mem @@ -33,38 +33,26 @@ factory_settings["hp_procurve_mem_default_levels"] = { "levels" : ("perc_used", (80, 90)) } + def inventory_hp_procurve_mem(info): if len(info) == 1 and int(info[0][0]) >= 0: return [ ("", 'hp_procurve_mem_default_levels') ] + def check_hp_procurve_mem(item, params, info): if len(info) == 1: mem_total, mem_used = [ int(mem) for mem in info[0] ] return check_memory(mem_used, mem_total, params) -# if mem_total > 0: -# perc = mem_used * 100 / float(mem_total) -# status = 0 -# output = '' -# if perc >= params[1]: -# status = 2 -# output = ' (Above %d%%)' % params[1] -# elif perc >= params[0]: -# status = 1 -# output = ' (Above %d%%)' % params[0] -# -# return (status, 'Memory usage is %d%% %s' % (perc, output), -# [('bytes_used', '%db' % mem_used, params[0], params[1], 0, mem_total)]) check_info["hp_procurve_mem"] = { - 'check_function': check_hp_procurve_mem, - 'inventory_function': inventory_hp_procurve_mem, - 'service_description': 'Memory', - 'group': 'memory_simple', - 'default_levels_variable': 'hp_procurve_mem_default_levels', - 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.4.1.11.2.14.11.5.1.1.2.1.1.1', ['5', '7']), - 'snmp_scan_function': \ - lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0"), - 'includes': [ "memory.include" ], + 'check_function' : check_hp_procurve_mem, + 'inventory_function' : inventory_hp_procurve_mem, + 'service_description' : 'Memory', + 'group' : 'memory_simple', + 'default_levels_variable' : 'hp_procurve_mem_default_levels', + 'has_perfdata' : True, + 'snmp_info' : ('.1.3.6.1.4.1.11.2.14.11.5.1.1.2.1.1.1', ['5', '7']), + 'snmp_scan_function' : lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0"), + 'includes' : [ "memory.include" ], }

9 years, 7 months

Check_MK Git: check_mk: #2049 FIX window agents: prevent errors with invalid plugin output

by Andreas Boesl

Module: check_mk Branch: master Commit: b7401aa83458297072518d12ba16f107afd0200a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7401aa8345829… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 2 13:32:23 2015 +0100 #2049 FIX window agents: prevent errors with invalid plugin output Plugins with invalid output no longer impair preceding (usually logwatch) and following (usually local) sections. --- .werks/2049 | 11 +++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 212480 -> 300032 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 212480 -> 300032 bytes agents/windows/check_mk_agent.cc | 3 +++ agents/windows/check_mk_agent.exe | Bin 181760 -> 181760 bytes agents/windows/check_mk_agent.msi | Bin 628224 -> 716288 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 181760 -> 181760 bytes agents/windows/install_agent-64.exe | Bin 162045 -> 177830 bytes agents/windows/install_agent.exe | Bin 158775 -> 158790 bytes 11 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2049 b/.werks/2049 new file mode 100644 index 0000000..cbc3982 --- /dev/null +++ b/.werks/2049 @@ -0,0 +1,11 @@ +Title: window agents: prevent errors with invalid plugin output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425299233 +Class: fix + +Plugins with invalid output no longer impair preceding (usually logwatch) +and following (usually local) sections. + diff --git a/ChangeLog b/ChangeLog index a038452..7426576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,6 +214,7 @@ * 1224 FIX: Fixed rare Bug in case of clusterd network interfaces... * 2079 FIX: freebsd agent: Was unable to find ntpq command with FreeBSD10... * 2082 FIX: jolokia_metrics.mem: Fixed levels on total memory usage + * 2049 FIX: window agents: prevent errors with invalid plugin output... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/windows/build_version b/agents/windows/build_version index a57f6ce..c8b255f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -131 +135 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 1c811db..8b2ce71 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 1a1f94b..47692f8 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 2ac7a08..b49497d 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3229,8 +3229,11 @@ void section_local(SOCKET &out) void section_plugins(SOCKET &out) { + // Prevent errors from plugins with missing section output(out, "<<<>>>\n"); output_external_programs(out, PLUGIN); + // Prevent errors from plugins with missing final newline + output(out, "<<<>>>\n"); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index d1093b3..36c527a 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index dd96fb7..c0f3b80 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 1422526..8593dd1 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index fe99923..812e260 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index eac4305..34ec659 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 7 months

Check_MK Git: check_mk: Fixed wording

by Lars Michelsen

Module: check_mk Branch: master Commit: aba866e4ec86c10626aff983f07a8afdcae02c77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aba866e4ec86c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 2 12:33:40 2015 +0100 Fixed wording --- mkeventd/web/plugins/wato/mkeventd.py | 4 ++-- web/plugins/wato/active_checks.py | 2 +- web/plugins/wato/datasource_programs.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 4d81d70..99cf63a 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1733,8 +1733,8 @@ if mkeventd_enabled: ), ( "connect_timeout", Integer( - title = _("Connection timeout"), - help = _("TCP connection timeout for connecting to the master"), + title = _("Connect Timeout"), + help = _("TCP connect timeout for connecting to the master"), label = _("Try bringing up TCP connection for"), unit = _("sec"), minvalue = 1, diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 6cee65a..70e42a6 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -188,7 +188,7 @@ register_rule(group, ), ("timeout", Integer( - title = _("Connection timeout"), + title = _("Connect Timeout"), help = _("Seconds before connection times out"), default_value = 10), ), diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index e40dc36..2a32e6d 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -72,7 +72,7 @@ register_rule(group, ), ( "timeout", Integer( - title = _("Connection timeout"), + title = _("Connect Timeout"), help = _("The network timeout in seconds when communicating with vSphere or " "to the Check_MK Agent. The default is 60 seconds. Please note that this " "is not a total timeout but is applied to each individual network transation."), @@ -367,7 +367,7 @@ register_rule(group, elements = [ ( "timeout", Integer( - title = _("Connection timeout"), + title = _("Connect Timeout"), help = _("The network timeout in seconds when communicating via UPNP. " "The default is 10 seconds. Please note that this " "is not a total timeout, instead it is applied to each API call."), @@ -426,7 +426,7 @@ register_rule(group, elements = [ ( "timeout", Integer( - title = _("Connection timeout"), + title = _("Connect Timeout"), help = _("The network timeout in seconds when communicating via HTTP. " "The default is 10 seconds."), default_value = 10, @@ -496,7 +496,7 @@ register_rule(group, maxvalue = 65535, )), ("timeout", Integer( - title = _("Connection timeout"), + title = _("Connect Timeout"), help = _("The connect timeout in seconds when establishing a connection " "with the PLC."), default_value = 60,

9 years, 7 months

Check_MK Git: check_mk: #2083 Added Siemens PLC (SPS) monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 516de739da79feb0d3d0f39869fc5ea9fa0526f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=516de739da79fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 2 12:27:18 2015 +0100 #2083 Added Siemens PLC (SPS) monitoring We added a special agent {agent_siemens_plc} which is using SNAP7 to fetch data from a Siemens PLC (SPS) device. You can use it do read memory areas from the agent, parse and interpret them, for example you can configure to read and integer from memory location X and handle it as temperature value in celsius. For the moment we added a temperature check, others will follow. --- .werks/2083 | 15 +++ ChangeLog | 1 + agents/special/agent_siemens_plc | 162 +++++++++++++++++++++++++++++++ checkman/siemens_plc | 23 +++++ checks/agent_siemens_plc | 43 ++++++++ checks/siemens_plc | 67 +++++++++++++ web/plugins/wato/datasource_programs.py | 85 ++++++++++++++++ 7 files changed, 396 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=516de739da…

9 years, 7 months

Check_MK Git: check_mk: #2082 FIX jolokia_metrics.mem: Fixed levels on total memory usage

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f741d79a58bfadd7c851d5f5c15237e713bd79b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f741d79a58bfa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 2 10:48:09 2015 +0100 #2082 FIX jolokia_metrics.mem: Fixed levels on total memory usage --- .werks/2082 | 10 ++++++++++ ChangeLog | 1 + checks/jolokia_metrics | 17 +++++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.werks/2082 b/.werks/2082 new file mode 100644 index 0000000..dc4bff1 --- /dev/null +++ b/.werks/2082 @@ -0,0 +1,10 @@ +Title: jolokia_metrics.mem: Fixed levels on total memory usage +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425289660 + + diff --git a/ChangeLog b/ChangeLog index 54fd205..c3f82fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -212,6 +212,7 @@ * 2027 FIX: fc_port: Fixed exception when wirespeed is reported as 0 by the device * 1224 FIX: Fixed rare Bug in case of clusterd network interfaces... * 2079 FIX: freebsd agent: Was unable to find ntpq command with FreeBSD10... + * 2082 FIX: jolokia_metrics.mem: Fixed levels on total memory usage Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index d568a71..8770010 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -238,6 +238,7 @@ def check_jolokia_metrics_mem(item, params, info): # rename totalheap to total # this block can be removed in the future (today 22.02.13) if "totalheap" in params: + params = params.copy() params["total"] = params["totalheap"] del params["totalheap"] @@ -271,11 +272,13 @@ def check_jolokia_metrics_mem(item, params, info): warn_level = 0 crit_level = 0 if type(params[what][0]) == int: + if value_max: + warn_level = value_max - params[what][0] + crit_level = value_max - params[what][1] + if what != "total": - if value_max: - warn_level = value_max - params[what][0] - crit_level = value_max - params[what][1] perfdata.append((what, value, warn_level, crit_level, "", value_max)) + if not value_max: param_state = 0 elif value >= crit_level: @@ -285,11 +288,13 @@ def check_jolokia_metrics_mem(item, params, info): param_state = 1 level_info = "%s(warn at %sMB free)" % (state_markers[1], params[what][0]) else: + if value_max: + warn_level = value_max * params[what][0] / 100.0 + crit_level = value_max * params[what][1] / 100.0 + if what != "total": - if value_max: - warn_level = value_max * params[what][0] / 100.0 - crit_level = value_max * params[what][1] / 100.0 perfdata.append((what, value, warn_level, crit_level, "", value_max)) + if not value_max: param_state = 0 elif value >= crit_level:

9 years, 7 months

Check_MK Git: check_mk: #2081 FIX Improved logging of mkeventd in error cases

by Lars Michelsen

Module: check_mk Branch: master Commit: c32ebb7b5f1b18d7259bf06872e5a5c3ed371877 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c32ebb7b5f1b18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 2 10:30:32 2015 +0100 #2081 FIX Improved logging of mkeventd in error cases --- .werks/2081 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/mknotifyd | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2081 b/.werks/2081 new file mode 100644 index 0000000..6b2354f --- /dev/null +++ b/.werks/2081 @@ -0,0 +1,10 @@ +Title: Improved logging of mkeventd in error cases +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425288608 + + diff --git a/ChangeLog b/ChangeLog index 8229f32..54fd205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -311,6 +311,7 @@ * 1988 FIX: Gracefully handle invalid empty bulk notification files from previous buggy versions * 2015 FIX: Fixed sending notifications for services with umlauts in names... * 2038 FIX: Log complete Email address into monitoring history when notifying explicity addresses + * 2081 FIX: Improved logging of mkeventd in error cases BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index e9519a4..f4e7c0f 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -136,6 +136,7 @@ class SpoolfilesHandler: if file_age < files_older_than: continue + verbose("Processing spoolfile: %s" % spoolfile_path) try: content = eval(file(spoolfile_path).read()) if not content.get("context"): @@ -152,7 +153,7 @@ class SpoolfilesHandler: try: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.settimeout(10) - host, port = content.get("forward").split(':',1) + host, port = content["forward"].split(':',1) del content["forward"] verbose("Forward notification to %s %s" % (host, port), 2) sock.connect((host, int(port))) @@ -173,6 +174,7 @@ class SpoolfilesHandler: break # Error while reading except Exception, e: # Connection problems + log("Failed to forward notification %s to %s:%s: %s" % (spoolfile_path, host, port, e)) verbose(format_exception(), 2) spoolfile_process_result = response_text != "OK" and 1 or 0 @@ -395,7 +397,7 @@ def cmp_config_paths(a, b): def usage(): sys.stdout.write("""Usage: mknotifyd [OPTIONS] - -v, --verbose Enable verbose output + -v, --verbose Enable verbose output, twice for more details -g, --foreground Do not daemonize, run in foreground -s, --single Single shot, exit after one cycle

9 years, 7 months

Check_MK Git: check_mk: #2080 FIX Fixed UnicodeDecodeError when using a localized GUI on notification configuration page

by Lars Michelsen

Module: check_mk Branch: master Commit: 4693867030c45b6918e09df2480b7c750473043d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4693867030c45b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 2 08:59:35 2015 +0100 #2080 FIX Fixed UnicodeDecodeError when using a localized GUI on notification configuration page --- .werks/2080 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 11 +++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/2080 b/.werks/2080 new file mode 100644 index 0000000..a72afaa --- /dev/null +++ b/.werks/2080 @@ -0,0 +1,10 @@ +Title: Fixed UnicodeDecodeError when using a localized GUI on notification configuration page +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425283147 + + diff --git a/ChangeLog b/ChangeLog index cf39199..8229f32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -299,6 +299,7 @@ * 2025 FIX: Fixed exception when synchronising custom ldap attributes in distributed WATO setup * 2026 FIX: Fixed exception when using umlauts in notification plugin descriptions... * 2078 FIX: Fixed exception with some snapshots when using a localized GUI... + * 2080 FIX: Fixed UnicodeDecodeError when using a localized GUI on notification configuration page Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6fedc3c..e4dbbb3 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -154,12 +154,15 @@ class html: for tf in self.transformations: text = tf(text) - if type(text) == unicode: - text = text.encode("utf-8") - if self.plugged: self.plugged_text += text else: + # encode when really writing out the data. Not when writing plugged, + # because the plugged code will be handled somehow by our code. We + # only encode when leaving the pythonic world. + if type(text) == unicode: + text = text.encode("utf-8") + self.lowlevel_write(text) def plug(self): @@ -1270,7 +1273,7 @@ class html: def debug(self, *x): import pprint for element in x: - self.lowlevel_write("<pre>%s</pre>\n" % pprint.pformat(element)) + self.lowlevel_write("<pre>%s</pre>\n" % self.attrencode(pprint.pformat(element))) def has_cookie(self, varname):

9 years, 7 months

Check_MK Git: check_mk: Also allowing xhtml <br> tags in exception texts

by Lars Michelsen

Module: check_mk Branch: master Commit: f2ab3d4b5600c1bf87fd3dc81a6a0ac57fb0a280 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2ab3d4b5600c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 2 08:37:36 2015 +0100 Also allowing xhtml <br> tags in exception texts --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 689519d..6fedc3c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1002,7 +1002,7 @@ class html: # <b>, <tt>, <i> to be part of the exception message. The tags # are escaped first and then fixed again after attrencode. msg = self.attrencode(obj) - msg = re.sub(r'<(/?)(b|tt|i|br|pre|a|sup|p|li|ul|ol)>', r'<\1\2>', msg) + msg = re.sub(r'<(/?)(b|tt|i|br(?: /)?|pre|a|sup|p|li|ul|ol)>', r'<\1\2>', msg) # Also repair link definitions msg = re.sub(r'<a href="(.*)">', r'<a href="\1">', msg)

9 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015