Monitoring/MyMonPlugins
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

monitoringplugins.py: two multiline output fixes

Browse source 
- typo: saved with wrong key
- list may be a list of lists
This commit is contained in:
Sven Velt 2016-09-20 22:17:43 +02:00
parent 16364832dd
commit 925cbb2297
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
monitoringplugin.py
View file

@ -209,7 +209,7 @@ class MonitoringPlugin(object):
check['tag'] = tag check['tag'] = tag
check['returncode'] = returncode check['returncode'] = returncode
check['output'] = output check['output'] = output
check['multilineoutout'] = multilineoutput check['multilineoutput'] = multilineoutput
check['perfdata'] = perfdata check['perfdata'] = perfdata
check['target'] = target check['target'] = target
@ -397,7 +397,7 @@ class MonitoringPlugin(object):
if type(multiline) == str: if type(multiline) == str:
out += '\n' + multiline.replace('|', ' ') out += '\n' + multiline.replace('|', ' ')
elif type(multiline) in [list, tuple]: 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 # Check if there's perfdata
if performancedata: if performancedata: