From 0898ab032e8310c548991bc7f950a933c74ce32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1ll=20Gu=C3=B0j=C3=B3n=20Sigur=C3=B0sson?= Date: Mon, 25 Oct 2010 17:05:23 +0000 Subject: [PATCH] --- nsclient/trunk/scripts/check_eva/check_eva.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nsclient/trunk/scripts/check_eva/check_eva.py b/nsclient/trunk/scripts/check_eva/check_eva.py index 1873472..fd38265 100644 --- a/nsclient/trunk/scripts/check_eva/check_eva.py +++ b/nsclient/trunk/scripts/check_eva/check_eva.py @@ -416,7 +416,7 @@ def check_operationalstate(object, print_failed_objects=False,namefield='objectn if not object.has_key(detailfield): detailfield = statefield if object['operationalstate'] not in valid_states: if print_failed_objects: - long("Warning, %s=%s (%s)\n" % ( object[namefield], object['operationalstate'], object[detailfield] )) + long("- Warning, %s=%s (%s)\n" % ( object[namefield], object['operationalstate'], object[detailfield] )) return warning debug( "OK, %s=%s (%s)\n" % ( object[namefield], object['operationalstate'], object[detailfield] ) ) return ok @@ -492,7 +492,8 @@ def check_generic(command="ls disk full",namefield="objectname", perfdata_fields nagios_state = max(nagios_state, check_multiple_objects(i, 'fibrechannelports')) nagios_state = max(nagios_state, check_multiple_objects(i, 'modules')) for x in longserviceoutputfields: - long( "- %s = %s\n" % (x, i[x])) + if i.has_key( x ): + long( "- %s = %s\n" % (x, i[x])) end(summary,perfdata,longserviceoutput,nagios_state)