[checkmk-commits] 3144 FIX bugfix: replacing pipe symbol in plugin output was broken

Module: check_mk Branch: master Commit: 8edbad64016d5f81b2844bf2127a13bdce8d3953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8edbad64016d5f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 16 09:10:14 2016 +0200 3144 FIX bugfix: replacing pipe symbol in plugin output was broken --- .werks/3144 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3144 b/.werks/3144 new file mode 100644 index 0000000..cae5214 --- /dev/null +++ b/.werks/3144 @@ -0,0 +1,10 @@ +Title: bugfix: replacing pipe symbol in plugin output was broken +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466060960 + + diff --git a/ChangeLog b/ChangeLog index b2b92fc..2a6f4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -272,6 +272,7 @@ * 3637 FIX: ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling * 3545 FIX: netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available * 3143 FIX: windows agent: fixed some minor memory and handle leaks + * 3144 FIX: bugfix: replacing pipe symbol in plugin output was broken Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index fc63a14..b0cbad7 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1919,7 +1919,7 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int # make sure that plugin output does not contain a vertical bar. If that is the # case then replace it with a Uniocode "Light vertical bar" - infotext = infotext.replace("|", "\u2758") + infotext = infotext.replace("|", u"\u2758".encode("utf8")) # Aggregated service -> store for later if sa != "":