From 1ccb5e700db08b52d526137daab16224f6bad863 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:48:59 +0000
Subject: [PATCH]

---
 .../trunk/scripts/check_eva/check_eva.exe     | Bin 33792 -> 33792 bytes
 nsclient/trunk/scripts/check_eva/check_eva.py |   6 +++++-
 nsclient/trunk/scripts/check_eva/library.zip  | Bin 1721340 -> 1721340 bytes
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nsclient/trunk/scripts/check_eva/check_eva.exe b/nsclient/trunk/scripts/check_eva/check_eva.exe
index a66a1ba1246398a7794a2aca7a2074d5b8f47587..23c4ea542480bdf5814b0d896dd04e652097c53e 100644
GIT binary patch
delta 507
zcmZ{gze_?<6vxjw`b>TLv?0UN(!mI6sI;XeLf49haL6`|-m`odFOYhV{IM9g-6@))
zpjEg-YeGY_Q$u6_K@crb*Joi3!sT*5p9AN9&#ASj)}l@u3AWfZt+FTVh$la#-V$E0
zjdTi2yq>;IVUNun+-D?*>4xmyCs`gaJy38!*z)yXsuN6vCW5X23KkHy{7{x{Do8dN
z5*RK<Y68dDyqb3xv5bI*o3+)c<s#-xfPw-Vfu0w7@IwH?qN^2z9}W(9Trhi9qv&Su
zY7)IHuB~~!P?!Wm2E)fRZBfW8ErEX4)h5nGX&THxKdQLH`vf7;7AudGvolCwy1-EE
zp(4<v{;`Dl>!Tz5%m_a_^s#@9V#C6(XD6k2QtVK+cNh`l4-(6EV);+vx&te9{!q#g
z>g?-io9~oEh*fr|FGv(bh4`i3CH&yK$1M*A`RkcNSmkdPcj6|yYpl?E_U5I5-&6W@
ALjV8(

delta 500
zcmZ{gKTASU7>D2Ycr&lp|7l`b8Ki?W6x!0_P$UILn~P0K<rTarXNq&ny2~Zn&L=3M
zp-DJFL{nR>&5>hYpbyaTnrMS?hTrdb;e8)Y$0i+{bgz+o?(-Y6$=|Rmqc|lW>v+sd
z`5f+wi~L;<A9?2FDg8~D2euD;#8iQ)P;)`T^z{=%nfyQ%pi?|mPotaf)GMAMHW83c
z^N0G}K@rOgpcVj~fKidy<Ln4R!a^`Z@Yh3w9v=4aphtj(fJGo$i$Khr0l74)XHn$^
zz2KE9aiCtH8n^W|37_>e`gl)|oy*ZYu%II;PaP4MmFKW^Ps)y)0?ZB6@2DifBK>Dd
zGR_w!@WlyyX~a|i7NtgmA?LiYoDBfeKx!FD`7Hxu%`w)-jH@neRmE3hi||adq!<7o
r+RZp3<yXckqIfZ03H}JPZL8=LZWbU&MeIx{xX0fwH*PKDA#3Fqd3|ya

diff --git a/nsclient/trunk/scripts/check_eva/check_eva.py b/nsclient/trunk/scripts/check_eva/check_eva.py
index 8379528..e6cea6c 100644
--- a/nsclient/trunk/scripts/check_eva/check_eva.py
+++ b/nsclient/trunk/scripts/check_eva/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 )
diff --git a/nsclient/trunk/scripts/check_eva/library.zip b/nsclient/trunk/scripts/check_eva/library.zip
index 9a4b69d66ee0857c624d51b253ebb253908a2988..95883626623e50e3bc090fa0e826a0ac67f5c254 100644
GIT binary patch
delta 379
zcmey<p82OeQ$N6)nMH&F1o-+QZ675i@u@H|Fn};OP%OSUKRG+KM6aMSdGjY;uD6Fa
z>T57@fK*OxU8p=co=Jk~?V*YKcQ=PIJ28UAZ=Mqto4kNU94bDI)gB@~(Z%P_<hyLr
zVDX2WZ?n5Y#GO>uzMrhcDFs!p%;mu-05ac8T~)yV=n4>??8qz32C*M#S92jxdm#@a
z5HkTWGZ3=?F)I+W0Wmuea{w_X5OV=BHxPr=^8zs+5c31E01yiTu@Ddo1F;AYivqD2
z5Q_t`1Q1JZFXWM$%MA7tC{(742}l{jeLme^KuQnp-|4LaQo3Ls$d}W1!Bm3$HvO}J
QlmS={<fHA{f>IZa0A`DJQUCw|

delta 379
zcmey<p82OeQ$N6)nMH&F1fFz6+H$16F;`(?U;trmpjdoyesXqdiC#fv^5##xTsAv5
z>T57@fK<*+zF0Lmo=JkqX6HoxyPLz9ofyI57I$U3CNE$Shl)>QwTFmTJ0Cha`7WC@
zSp4DU+wATT@z07DYbI-PN<q~tb9pcdfXuI+_UNJk&=nv&*^yV64PrmguI56X_Cg*;
zAZ7w$W*}w(Vpbq#17da{<^W<&Am##MZXgD!=LKRuAm#^R0U#CxVj&<F24WE)76oE4
zAQlH=2_Tl-UdSUgml^CQP^e576Ob~5`+T~;fRrBGztdX<q;$bNkT0k2f~f@gZTe>c
RDFcWc&_~;~1*I+;0RVJ|fOY@?