Merge pull request #16 from Napsty/pywbem-versions

Distinguish between pywbem 0.7 and 0.8

check_esxi_hardware.py

@@ -24,7 +24,7 @@
 # Copyright (c) 2008 David Ligeret
 # Copyright (c) 2009 Joshua Daniel Franklin
 # Copyright (c) 2010 Branden Schneider
-# Copyright (c) 2010-2015 Claudio Kuenzler
+# Copyright (c) 2010-2016 Claudio Kuenzler
 # Copyright (c) 2010 Samir Ibradzic
 # Copyright (c) 2010 Aaron Rogers
 # Copyright (c) 2011 Ludovic Hutin
@@ -36,6 +36,8 @@
 # Copyright (c) 2012 Craig Hart
 # Copyright (c) 2013 Carl R. Friend
 # Copyright (c) 2015 Andreas Gottwald
+# Copyright (c) 2015 Stanislav German-Evtushenko
+# Copyright (c) 2015 Stefan Roos
 #
 # The VMware 4.1 CIM API is documented here:
 #   http://www.vmware.com/support/developer/cim-sdk/4.1/smash/cim_smash_410_prog.pdf
@@ -216,17 +218,35 @@
 #@ Author : Andreas Gottwald
 #@ Reason : Fix NoneType element bug
 #@---------------------------------------------------
+#@ Date   : 20150626
+#@ Author : Claudio Kuenzler (www.claudiokuenzler.com)
+#@ Reason : Added support for patched pywbem 0.7.0 and new version 0.8.0, handle SSL error exception
+#@---------------------------------------------------
+#@ Date   : 20150710
+#@ Author : Stanislav German-Evtushenko
+#@ Reason : Exit Unknown instead of Critical for timeouts and auth errors
+#@---------------------------------------------------
+#@ Date   : 20151111
+#@ Author : Stefan Roos
+#@ Reason : Removed unused sensor_value variable and string import.
+#@ Reason : Added global hosturl variable declaration after imports.
+#@---------------------------------------------------
+#@ Date   : 20160411
+#@ Author : Claudio Kuenzler (www.claudiokuenzler.com)
+#@ Reason : Distinguish between pywbem 0.7 and 0.8 (which is now released)
+#@---------------------------------------------------
 
 import sys
 import time
 import pywbem
 import re
-import string
+import pkg_resources
 from optparse import OptionParser,OptionGroup
 
-version = '20150119'
+version = '20160411'
 
 NS = 'root/cimv2'
+hosturl = ''
 
 # define classes to check 'OperationStatus' instance
 ClassesToCheck = [
@@ -565,12 +585,28 @@ if os_platform != "win32":
   on_windows = False
   import signal
   def handler(signum, frame):
-    print 'CRITICAL: Execution time too long!'
-    sys.exit(ExitCritical)
+    print 'UNKNOWN: Execution time too long!'
+    sys.exit(ExitUnknown)
 
 # connection to host
 verboseoutput("Connection to "+hosturl)
-wbemclient = pywbem.WBEMConnection(hosturl, (user,password), NS)
+# pywbem 0.7.0 handling is special, some patched 0.7.0 installations work differently
+pywbemversion = pkg_resources.get_distribution("pywbem").version
+verboseoutput("Found pywbem version "+pywbemversion)
+if '0.7.' in pywbemversion:
+  try:
+    conntest = pywbem.WBEMConnection(hosturl, (user,password))
+    c = conntest.EnumerateInstances('CIM_Card')
+  except:
+    #raise
+    verboseoutput("Connection error, disable SSL certification verification (probably patched pywbem)")
+    wbemclient = pywbem.WBEMConnection(hosturl, (user,password), no_verification=True)
+  else:
+    verboseoutput("Connection worked")
+    wbemclient = pywbem.WBEMConnection(hosturl, (user,password))
+# pywbem 0.8.0 and later
+elif '0.8.' in pywbemversion:
+  wbemclient = pywbem.WBEMConnection(hosturl, (user,password), NS, no_verification=True)
 
 # Add a timeout for the script. When using with Nagios, the Nagios timeout cannot be < than plugin timeout.
 if on_windows == False and timeout > 0:
@@ -619,19 +655,18 @@ for classe in ClassesToCheck :
     instance_list = wbemclient.EnumerateInstances(classe)
   except pywbem.cim_operations.CIMError,args:
     if ( args[1].find('Socket error') >= 0 ):
-      print "CRITICAL: %s" %args
-      sys.exit (ExitCritical)
+      print "UNKNOWN: %s" %args
+      sys.exit (ExitUnknown)
     else:
       verboseoutput("Unknown CIM Error: %s" % args)
   except pywbem.cim_http.AuthError,arg:
     verboseoutput("Global exit set to UNKNOWN")
-    GlobalStatus = ExitCritical
+    GlobalStatus = ExitUnknown
     print "UNKNOWN: Authentication Error"
     sys.exit (GlobalStatus)
   else:
     # GlobalStatus = ExitOK #ARR
     for instance in instance_list :
-      sensor_value = ""
       elementName = instance['ElementName']
       if elementName is None :
         elementName = 'Unknown'