From b5f08211f38ba3400a1ad8bc97707b69a8e6bb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1ll=20Gu=C3=B0j=C3=B3n=20Sigur=C3=B0sson?=
 <palli@opensource.is>
Date: Mon, 25 Oct 2010 17:47:39 +0000
Subject: [PATCH]

---
 check_eva/trunk/check_eva.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/check_eva/trunk/check_eva.py b/check_eva/trunk/check_eva.py
index 8379528..e6cea6c 100644
--- a/check_eva/trunk/check_eva.py
+++ b/check_eva/trunk/check_eva.py
@@ -441,7 +441,11 @@ def check_generic(command="ls disk full",namefield="objectname", perfdata_fields
 	summary = "%s objects found " % len(objects)
         for i in objects:
                 systemname = i['systemname']
-                objectname = i[namefield]
+		# Some versions of commandview use "objectname" instead of namefield
+		if i.has_key( namefield ):
+			objectname = i[namefield]
+		else:
+			objectname = i['objectname']
                 
 		# Lets see if this object is working
                 nagios_state = max( check_operationalstate(i), nagios_state )