[checkmk-commits] #2740 local: better warning output in case of invalid agent output

Module: check_mk Branch: master Commit: 7847721608f75bfa7f4ca5d3a4ff6178e38d30c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7847721608f75b… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Nov 6 13:40:23 2015 +0100 #2740 local: better warning output in case of invalid agent output --- .werks/2740 | 9 +++++++++ ChangeLog | 1 + checks/local | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2740 b/.werks/2740 new file mode 100644 index 0000000..0e53a8f --- /dev/null +++ b/.werks/2740 @@ -0,0 +1,9 @@ +Title: local: better warning output in case of invalid agent output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446813608 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fdf601d..d09590c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 2720 nullmailer_mailq: New check for monitoring the outgoing mail queue of Nullmailer... * 2707 winperf_processor: can now be configured to warn if a single cpu core exceeds a utilization threshold for a while... * 2708 sap, sap_state: new sap_state service reports connection problems to sap hosts... + * 2740 local: better warning output in case of invalid agent output * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/local b/checks/local index 28a7cf5..434dd39 100644 --- a/checks/local +++ b/checks/local @@ -92,7 +92,7 @@ def inventory_local(info): if len(line) >= 4 or len(line) == 3 and line[0] == 'P': inventory.append( (line[1], None) ) else: - raise MKGeneralException("Invalid local check output: %s" % " ".join(line)) + raise MKGeneralException("Invalid line in agent section <<<local>>>: %s" % " ".join(line)) return inventory