Module: check_mk Branch: master Commit: 6caee5e3fdcb117fd89d2ec27cc9cb2bc2120119 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6caee5e3fdcb11… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 26 11:05:25 2016 +0200 3985 FIX mrpe: fixed broken long output when using the CMC The long output of the mrpe check was appended to the plugin output. This has been fixed. --- .werks/3985 | 10 ++++++++++ ChangeLog | 1 + checks/mrpe | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3985 b/.werks/3985 new file mode 100644 index 0000000..b09e927 --- /dev/null +++ b/.werks/3985 @@ -0,0 +1,10 @@ +Title: mrpe: fixed broken long output when using the CMC +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1477472567 +Class: fix + +The long output of the mrpe check was appended to the plugin output. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 99234fd..15e5f0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 3829 FIX: Skype for Business checks: refactored most of the checks... * 3961 FIX: fixed error sections handling if parse function is available * 3831 FIX: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated... + * 3985 FIX: mrpe: fixed broken long output when using the CMC... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/mrpe b/checks/mrpe index 118fbeb..f4db5ab 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -106,7 +106,7 @@ def check_mrpe(item, params, info): # name of check command needed for PNP to choose the correct template if check_name: perf_parsed.append(check_name) - best_result = state, "\\n".join(output), perf_parsed + best_result = state, "\n".join(output), perf_parsed best_state = state