From 580c3ea338f94af2857433e6d1365f1cd7cc44f8 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, 6 Sep 2010 12:53:48 +0000
Subject: [PATCH]

---
 .../trunk/scripts/check_eva/check_eva.exe     | Bin 30720 -> 30720 bytes
 nsclient/trunk/scripts/check_eva/check_eva.py |  24 +++++++++++++++---
 nsclient/trunk/scripts/check_eva/library.zip  | Bin 1343570 -> 1343570 bytes
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/nsclient/trunk/scripts/check_eva/check_eva.exe b/nsclient/trunk/scripts/check_eva/check_eva.exe
index 4c1c7052c664a1caf8a73d25fe87494831811a97..29afb05d38c090b7dea5cf140bc55a2f68984d98 100644
GIT binary patch
delta 2753
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
MGK~|R=D<YaU%=`=T>t<8

delta 2463
zcmaJ>Yiv|i5T0|pyX|&MSz5L&1^S>{x&;b!De@{p0oy7MVM~SHmdDa_`(ht0dufR&
z?m`RlsDK_G5i|x2#Kb5~R{4P@N@9!=6AcpoDv7^LG-ya5fkbEK(stp8$?mt`nKLtI
z&Np*5abG0vi_sCGb*)jCwdLwNF^V+#x^|~p`@2qUs_|<-*Ch|vJjjUOvjIo|9Z`TT
zKx&|CAk#ok1H%SEJ4i$aNIU51ARVA*fJ_J72{HrpOps2{T_7_-&w?(@GYO;%j7eZ*
zL9NVUmVpcn_;Di3W|oO;GO{=rE~IV<X7fRlLGA+GO$nt3_D+FN4(K@`Xr0IFT+nl^
zbw2E!3Ly{Z9th=uo@ZGLU~fL?`5>pkFxFE5vXIF%kkgqIf{{yCDAuRLf%vDwm;uIg
z7{aSNpvMN$i$dVKdnT>XsuzJ#1ab!SXb`o5=z9W!3^U2lJIPuU@h;Z&OeDaVb8)J3
zNs4oP;v6yVU7G4WE5&=lSsQmQOLg|Lb0#W*Eh--ODQ9#3v*pRzkROaY#+@os6Zts8
z|7-+}1b*DmlMYdAih-I|k~(>)ljysujf*oUHP>9ug+&=9G*4ri%p-HWHyw+uf~W_#
z3t$NFCkKoSQr^mjXUv~C1I6D)V^#`s0T_r2aeAtm`H?MRR)cIYvloypVYU?6GG@z>
ztzcFQwQ;$U>5FJw#p5vxB+krgkaaMOZ@~+44cp5>u4OWt234+uVVsQ$kT0>(2eO_?
zCCCOQbLjcVMvyOqd<Eos=)?)z0K@o>=7QWvTb%%L{F2`$-k1mSRSvEKxtYm)kXxAG
zZ5LSbq|xi7VQfI<0?@sX%z8D*rZMiP`t?P0gkA#%X59(~E}Oxq0r?sj=&%ipY7C6q
zMC5nW9FtDrq%K^{=Yt|YSoWOp!?ttM7D_7hl*3xbI5y({4#Tq!SUGb!Ck|xX3Lrh2
zsoo*bL}aVwG?ksoaKTAs8~f~_8=z`<1H>V~q+S$aCyi!aL*vsSnpopBxp<netxdk&
z0AM;1LechMs4JShyXNaOu}+<<|4D3D9StYNPW4a2=gG&7Pc(5l`Dp#)bn$_D(DY?f
zB?jSNqzN#X2Ga)dM?eQ3IjBKHqbbNvQ;YwmO+F31H^s6L%VQ-~B?yBEY&Pv^jhR8y
zP+OYA*=Yh-4m5$t6ZYht=G&Sd8w!C#2);~Wae@TFVS;{w7=md-hy=q%;E4KhdyB|W
zl`S`2Z`1ZMf`t03#cO{HX_?B`rAVkjeVLe}Zs@h*5OSX*a0)jUsM6L!2ZtTPh%)tU
zYoYL~d#$-{{0D`=ae^ZRN0qJZBXLB1(ze1)k%19{l>{f$qqd7;X;SUTv58@IEm-V$
z8ge^WB#x;+f;Yu+b#>3LD^HO7L4po~9)gnu7YVi!C<K<NBNPpqTx8%4+89x{+P#G=
zPlDF0k%w3d!Fly>d!vKpI;=Lza_>82y+pt_Ayurr-9|_T-lL88)p@yFtW7?Yr-bV$
zSxyriS7$m_yU!6lPw+0m1@&7;HC`sCv#fEVS}vaD;2NoTAB|X`h=8)0E`)B=2=Ai4
z?~hs8IPV2@uyd9DGVYHgZ*@+!qjtZ9O2j4gFf<#LE(-e`Z&I3LYD2gk6&wx6#8Ksq
zoD*-Tn-RabuKtWvh||gwy&Hc{*$Gi;1OoV4z>@MhF>YNLnVF5y6^)s_(S0TtXjo!T
zOkn{9JU4|`DU|Nj9*vm$qM?xC+!y1q3|v!vy}53d{WFTRCQ_a4HN_Xo*;gg5B$xDM
zYr?7OW4B!_!-wQ|B{{>a6t#<qw-ew~f`Ea*lOB#rgS%HB48@GV3fgQXs3G9XkEk>I
z^W1zt?gh;UK7$+kdu%jVs<_{?fv;6T8!QX8%aY|RF>dR}#Hc5Mc?91RuzXjDajj41
qEz!TwRf@*gHwX@)zUtqjst1aNU2PdytJSSjX9q%RbYOGJxAs4Wo)jnm

diff --git a/nsclient/trunk/scripts/check_eva/check_eva.py b/nsclient/trunk/scripts/check_eva/check_eva.py
index ae9a6fe..e6fa04d 100644
--- a/nsclient/trunk/scripts/check_eva/check_eva.py
+++ b/nsclient/trunk/scripts/check_eva/check_eva.py
@@ -27,14 +27,18 @@
 
 
 
+# Some Defaults
+show_perfdata = True
+show_longserviceoutput = True
+debugging = False
 
 
-# First some defaults
+
+# check_eva defaults
 hostname="localhost"
 username="eva"
 password="eva1234"
 mode="check_systems"
-debugging = False
 path=''
 
 # No real need to change anything below here
@@ -119,6 +123,14 @@ while len(arguments) > 0:
 			error("Invalid --mode %s" % arg)
 	elif arg == '-d' or arg == '--debug':
 		debugging=True
+	elif arg == '--longserviceoutput':
+		show_longserviceoutput = True
+	elif arg == '--no-longserviceoutput':
+		show_longserviceoutput = False
+	elif arg == '--perfdata':
+		show_perfdata = True
+	elif arg == '--no-perfdata':
+		show_perfdata = False
 	elif arg == '-h' or '--help':
 		print_help()
 		exit(ok)
@@ -257,8 +269,12 @@ def run_sssu(system=None, command="ls system full"):
 	return objects
 
 def end(summary,perfdata,longserviceoutput,nagios_state):
+	global show_longserviceoutput
+	global show_perfdata
+	if not show_perfdata: perfdata = ""
 	print "%s - %s | %s" % (state[nagios_state], summary,perfdata)
-	print longserviceoutput
+	if show_longserviceoutput:
+		print longserviceoutput
 	exit(nagios_state)
 
 def check_systems():
@@ -523,7 +539,7 @@ def set_path():
 	current_path = getenv('PATH')
 	if path == '':
 		if current_path.find('C:\\') > -1: # We are on this platform
-			path = "C:\Program Files\Hewlett-Packard\Sanworks\Element Manager for StorageWorks HSV"
+			path = "C:\\Program Files\\Hewlett-Packard\\Sanworks\\Element Manager for StorageWorks HSV"
 		else:
 			path = "/usr/local/bin"
 	current_path = "%s:%s" % (current_path,path)
diff --git a/nsclient/trunk/scripts/check_eva/library.zip b/nsclient/trunk/scripts/check_eva/library.zip
index 7055589daa5f4e8076da765e4cb94f583f060bc1..a2d7c197639da2ac29a33e2d83b93835f344d22d 100644
GIT binary patch
delta 225
zcmccA5Ok>_NGHIXnMH&F1U{y!+1}V_mnXr*zyQMRK(VAMBfWyk<jtRWxt>32*{CDU
z!~s%vHf8UT$^J}I%s|1-IZP@L(T!H-%O=lYkq3!R)Vb3<jkSFmD<cpy0WmWWvj8zj
zj17p{ftUk`If0l9h`E872Z(urm=B2gfmi^D1%X%yh=sRLV-=a_2euyM%IP*CBD!$L
UOfL)(F#z*Gj@Z63L}aBl0KF?r@c;k-

delta 227
zcmccA5Ok>_NGHIXnMH&F1TF}u*k(+Y|0%)5zyQMRK(VAMBfWyk<jtRWxmK=h+^8eX
z!~s&a;;M4oWPc_pW}x8a93~Zr=+8WNuE{f4<Uyhnb?!7zV{M<t$_T_vK+FupEI<qr
zV*_G#Am#vKP9Ww2Vs0Sj0b*Vt<^y7WAQk{(K_C_aV&U!6SViXffvpF*a=J~3i0<?a
aVInLnAlFPU3=uJaa6!)4zA{8)r8WSt5l6=W