[checkmk-commits] Check_MK Git: check_mk: FIX Active checks: Non-ascii check commands now converted into utf-8

Module: check_mk Branch: master Commit: adea2c6c89bb27eca716e0086531ed91d732c396 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adea2c6c89bb27… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Wed Jul 23 14:13:38 2014 +0200 FIX Active checks: Non-ascii check commands now converted into utf-8 There were some instances where the arguments for an active check did contain non-ASCII characters, for example python unicode. This caused an exception during the configuration generation.<br> Check commands for active checks are now always converted into utf-8. --- .werks/1087 | 12 ++++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1087 b/.werks/1087 new file mode 100644 index 0000000..0c988e2 --- /dev/null +++ b/.werks/1087 @@ -0,0 +1,12 @@ +Title: Active checks: Non-ascii check commands now converted into utf-8 +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406117438 +Class: fix + +There were some instances where the arguments for an active check +did contain non-ASCII characters, for example python unicode. +This caused an exception during the configuration generation.<br> + +Check commands for active checks are now always converted into utf-8. diff --git a/ChangeLog b/ChangeLog index b12e814..ef761aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * 1083 FIX: ad_replication.bat: does not return data if the server is no DC * 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided... * 1084 FIX: ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions... + * 1087 FIX: Active checks: Non-ascii check commands now converted into utf-8... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/modules/check_mk.py b/modules/check_mk.py index c657767..9f9c4f9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2393,7 +2393,7 @@ define service { check_command\t\t\t%s active_checks_enabled\t\t1 %s} -""" % (template, hostname, make_utf8(description), simulate_command(command), extraconf)) +""" % (template, hostname, make_utf8(description), make_utf8(simulate_command(command)), extraconf)) # write service dependencies for active checks outfile.write(get_dependencies(hostname,description))