Monitoring
/
nagios-plugins
mirror of https://github.com/opinkerfi/nagios-plugins.git
1
0
Fork 0
Code Issues Releases Wiki Activity

check_eva - minor bugfixes

This commit is contained in:
Pall Sigurdsson 2013-09-02 10:50:48 +00:00
parent 92a6643a4b
commit c6cb2b634d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
check_eva/check_eva.py
View File

@ -447,7 +447,7 @@ def check_operationalstate(my_object, print_failed_objects=False,namefield='obje
def check_generic(command="ls disk full",namefield="objectname", perfdata_fields=None, longserviceoutputfields=None, detailedsummary=False): def check_generic(command="ls disk full",namefield="objectname", perfdata_fields=None, longserviceoutputfields=None, detailedsummary=False):
if not perfdata_fields: if not perfdata_fields:
perfdata_fields = ['good'] perfdata_fields = []
if not longserviceoutputfields: if not longserviceoutputfields:
longserviceoutputfields = [] longserviceoutputfields = []
global perfdata global perfdata
@ -493,7 +493,7 @@ def check_generic(command="ls disk full",namefield="objectname", perfdata_fields
for field in perfdata_fields: for field in perfdata_fields:
if field == '': continue if field == '': continue
add_perfdata( "'%s%s'=%s " % (identifier, field, i[field]) ) add_perfdata( "'%s%s'=%s " % (identifier, field, i.get(field,None) ))
# Disk group gets a special perfdata treatment # Disk group gets a special perfdata treatment
if command == "ls disk_group full": if command == "ls disk_group full":
@ -697,10 +697,9 @@ elif mode == 'check_diskgroups':
elif mode == 'check_disks': elif mode == 'check_disks':
check_generic(command="ls disk full",namefield="objectname") check_generic(command="ls disk full",namefield="objectname")
elif mode == 'check_diskshelfs' or mode == 'check_diskshelves': elif mode == 'check_diskshelfs' or mode == 'check_diskshelves':
check_generic(command="ls diskshelf full",namefield="diskshelfname",longserviceoutputfields=[], perfdata_fields=[]) check_generic(command="ls diskshelf full", namefield="diskshelfname", longserviceoutputfields=[], perfdata_fields=[])
else: else:
print "* Error: Mode %s not found" % mode print "* Error: Mode %s not found" % mode
print_help() print_help()
print "* Error: Mode %s not found" % mode print "* Error: Mode %s not found" % mode
exit(unknown) exit(unknown)