From 925cbb2297643b27e2419e344efe3c5d274715b0 Mon Sep 17 00:00:00 2001 From: Sven Velt Date: Tue, 20 Sep 2016 22:17:43 +0200 Subject: [PATCH] monitoringplugins.py: two multiline output fixes - typo: saved with wrong key - list may be a list of lists --- monitoringplugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitoringplugin.py b/monitoringplugin.py index c3924b2..31f7564 100644 --- a/monitoringplugin.py +++ b/monitoringplugin.py @@ -209,7 +209,7 @@ class MonitoringPlugin(object): check['tag'] = tag check['returncode'] = returncode check['output'] = output - check['multilineoutout'] = multilineoutput + check['multilineoutput'] = multilineoutput check['perfdata'] = perfdata check['target'] = target @@ -397,7 +397,7 @@ class MonitoringPlugin(object): if type(multiline) == str: out += '\n' + multiline.replace('|', ' ') elif type(multiline) in [list, tuple]: - out += '\n' + '\n'.join(multiline).replace('|', ' ') + out += '\n' + '\n'.join([item for sublist in multiline for item in sublist]).replace('|', ' ') # Check if there's perfdata if performancedata: