22 May
2013
22 May
'13
3:35 p.m.
Module: check_mk
Branch: master
Commit: 7705017d0d5db5093d9bdaa1538eecac56832dfe
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7705017d0d5db5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed May 22 15:35:16 2013 +0200
mrpe: handle long plugin output correctly
---
ChangeLog | 1 +
checks/mrpe | 55 ++++++++++++++++++++++++++++++++++++-------------------
2 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2032928..43328f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,7 @@
* logwatch: Agent can now use logwatch.d/ to split config to multipe files
* logwatch: Agent can now rewrite Messages
* apache_status: New rule: set levels for number of remaining open slots
+ * mrpe: handle long plugin output correctly, including performance data
Notifications:
* notify.py: unique spoolfiles name no longer created with uuid
diff --git a/checks/mrpe b/checks/mrpe
index b0f8e12..aa1390e 100644
--- a/checks/mrpe
+++ b/checks/mrpe
@@ -37,7 +37,14 @@ def inventory_mrpe(info):
return items
+def mrpe_parse_perfdata(perfinfo):
+ varname, valuetxt = perfinfo.split("=", 1)
+ values = valuetxt.split(";")
+ return tuple( [varname] + values)
+
+
def check_mrpe(item, params, info):
+
# This check is cluster-aware. An item might be found
# more than once. In that case we use the best of the
# multiple statuses.
@@ -52,38 +59,48 @@ def check_mrpe(item, params, info):
check_name = None
if line[0] == item:
state = int(line[1])
- rest = " ".join(line[2:])
- parts = rest.split("|", 1)
- # replace first line break with "\\n" -> Nagios expects it like
this
- output = parts[0].replace("\1", "\\n",
1).replace("\1", "<br>")
+ # convert to original format by joining and replacing \1 back with \n
+ rest = " ".join(line[2:]).replace("\1", "\n")
+ # split into lines
+ lines = rest.split('\n')
+ # First line: OUTPUT|PERFDATA
+ parts = lines[0].split("|", 1)
+ output = [parts[0].strip()]
+ if len(parts) > 1:
+ perfdata = parts[1].strip().split()
+ else:
+ perfdata = []
- perfdata = []
- if len(parts) > 1: # found pipe symbol
- perftxt = parts[1].strip()
- for perfinfo in perftxt.split(" "):
- try:
- varname, valuetxt = perfinfo.split("=", 1)
- values = valuetxt.split(";")
- perfdata.append(tuple( [varname] + values) )
- except:
- pass
+ # Further lines
+ now_comes_perfdata = False
+ for l in lines[1:]:
+ if now_comes_perfdata:
+ perfdata += l.split()
+ else:
+ parts = l.split("|", 1)
+ output.append(parts[0].strip())
+ if len(parts) > 1:
+ perfdata += parts[1].strip().split()
+ now_comes_perfdata = True
- # name of check command needed for PNP to choose the correct template
- if check_name:
- perfdata.append(check_name)
if best_state in [ None, 2 ] \
or (state < best_state and state != 2):
- best_result = state, output, perfdata
+ infotext = "\\n".join(output)
+ perf_parsed = map(mrpe_parse_perfdata, perfdata)
+ # 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_state = state
+
if best_state == None:
return (3, "Check output not found in output of MRPE")
else:
return best_result
-
check_info["mrpe"] = {
'check_function': check_mrpe,
'inventory_function': inventory_mrpe,