[checkmk-commits] 3105 FIX fixed crash in cmk --dump for services containing non-ascii characters

Module: check_mk Branch: master Commit: 3661fae796a6f560b4990664a5740da3271f5cd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3661fae796a6f5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Mar 21 14:07:03 2016 +0100 3105 FIX fixed crash in cmk --dump for services containing non-ascii characters --- .werks/3105 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3105 b/.werks/3105 new file mode 100644 index 0000000..8624c23 --- /dev/null +++ b/.werks/3105 @@ -0,0 +1,10 @@ +Title: fixed crash in cmk --dump for services containing non-ascii characters +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458565578 + + diff --git a/ChangeLog b/ChangeLog index 31e8866..e5371d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 3275 FIX: Piggyback based services were skipped on "No agent hosts"... * 3286 FIX: Fixing possible logging issues when using datasource programs for monitoring... * 3008 FIX: Fixed exception in logwatch config generation when using Nagios... + * 3105 FIX: fixed crash in cmk --dump for services containing non-ascii characters Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index 3287a46..deb0da5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3800,9 +3800,9 @@ def dump_host(hostname): print_table(headers, colors, [ [ checktype, - item, + make_utf8(item), params, - description, + make_utf8(description), make_utf8(",".join(service_extra_conf(hostname, description, service_groups))), if_aggr(aggregated_service_name(hostname, description)), if_aggr(",".join(service_extra_conf(hostname, aggregated_service_name(hostname, description), summary_service_groups))),