Github actions: pywbem

Github actions: fix names

Github actions: Other fixes

Github actions: Other fixes

Github actions: Debugging

Github actions: Debugging and remove pywbem 0.9 from pip install

Github actions: Add PYTHONPATH env

Github actions: Debugging

Github actions: Debugging

Github actions: Debugging

Github actions: PIP modules dont seem to work

Github actions: PIP modules dont seem to work

Github actions: PIP modules dont seem to work

.github/workflows/python2check.yml

@@ -0,0 +1,77 @@
+# @file python2check.yml
+---
+name: Python2 check
+
+# Trigger the workflow on push or pull request
+on: [push, pull_request]
+
+jobs:
+  python2-pywbem08:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v1
+      with:
+        python-version: '2.7'
+    - name: Install pywbem from apt
+      run: |
+        sudo apt-get install -qq -yy python-pywbem
+    - name: Set environment PYTHONPATH
+      run: |
+        export PYTHONPATH=/opt/hostedtoolcache/Python
+    - name: Launch script with --help
+      run: |
+        ./check_esxi_hardware.py --help
+
+# Jobs with PIP installations are currently disabled. 
+#  python2-pywbem09:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '2.7'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python-pip
+#        pip install pywbem==0.9.1
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help
+#  python2-pywbem012:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '2.7'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python-pip
+#        pip install pywbem==0.12.6
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help
+#  python2-pywbem014:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '2.7'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python-pip
+#        pip install pywbem==0.14.6
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help

.github/workflows/python3check.yml

@@ -0,0 +1,114 @@
+# @file python3check.yml
+---
+name: Python3 check
+
+# Trigger the workflow on push or pull request
+on: [push, pull_request]
+
+jobs:
+  simple-output:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Simple hello world
+        run: echo "Hello World"
+#  python3-pywbem-latest:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '3.8'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python3-pip
+#        pip3 install pywbem
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python/3.8.0/x64/lib/python3.8/site-packages
+#    - name: Verify python sys.path
+#      run: (echo "import sys"; echo "print(', '.join(sys.path))") | python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help
+#  python3-pywbem-08:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '3.x'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python3-pip
+#        pip3 install pywbem==0.8.4
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help
+#  python3-pywbem-012:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '3.x'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python3-pip
+#        pip3 install pywbem==0.12.6
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help
+#  python3-pywbem-013:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '3.x'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python3-pip
+#        pip3 install pywbem==0.13.1
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help
+#  python3-pywbem-014:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '3.x'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python3-pip
+#        pip3 install pywbem==0.14.6
+#    - name: Set environment PYTHONPATH
+#      run: |
+#        export PYTHONPATH=/opt/hostedtoolcache/Python
+#    - name: Launch script with --help
+#      run: |
+#        ./check_esxi_hardware.py --help
+#  find-pywbem:
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions/setup-python@v1
+#      with:
+#        python-version: '3.x'
+#    - name: Install latest pywbem from pip
+#      run: |
+#        sudo apt-get install -qq -yy python-pip
+#        pip install pywbem
+#    - name: Find pywbem module
+#      run: |
+#        find / -name 'pywbem-*'

README.md

@@ -8,4 +8,4 @@ This is the public git repository for development of the plugin.
 
 Documentation + Production Ready Plugin
 -------------
-Please refer to http://www.claudiokuenzler.com/nagios-plugins/check_esxi_hardware.php 
+Please refer to https://www.claudiokuenzler.com/monitoring-plugins/check_esxi_hardware.php 

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-2016 Claudio Kuenzler
+# Copyright (c) 2010-2019 Claudio Kuenzler
 # Copyright (c) 2010 Samir Ibradzic
 # Copyright (c) 2010 Aaron Rogers
 # Copyright (c) 2011 Ludovic Hutin
@@ -38,6 +38,7 @@
 # Copyright (c) 2015 Andreas Gottwald
 # Copyright (c) 2015 Stanislav German-Evtushenko
 # Copyright (c) 2015 Stefan Roos
+# Copyright (c) 2018 Peter Newman
 #
 # 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
@@ -46,8 +47,8 @@
 # The VMware 5.x CIM API is documented here:
 #   http://pubs.vmware.com/vsphere-50/index.jsp?nav=/5_1_1
 #
-# This Nagios plugin is maintained here:
-#   http://www.claudiokuenzler.com/nagios-plugins/check_esxi_hardware.php
+# This monitoring plugin is maintained and documented here:
+#   https://www.claudiokuenzler.com/monitoring-plugins/check_esxi_hardware.php
 #
 #@---------------------------------------------------
 #@ History
@@ -243,7 +244,31 @@
 #@ Author : Claudio Kuenzler (www.claudiokuenzler.com)
 #@ Reason : Added support for pywbem 0.9.x (and upcoming releases)
 #@---------------------------------------------------
+#@ Date   : 20170905
+#@ Author : Claudio Kuenzler (www.claudiokuenzler.com)
+#@ Reason : Added option to ignore LCD/Display related elements (--no-lcd)
+#@---------------------------------------------------
+#@ Date   : 20180329
+#@ Author : Claudio Kuenzler (www.claudiokuenzler.com)
+#@ Reason : Try to use internal pywbem function to determine version
+#@---------------------------------------------------
+#@ Date   : 20180411
+#@ Author : Peter Newman
+#@ Reason : Throw an unknown if we can't fetch the data for some reason
+#@---------------------------------------------------
+#@ Date   : 20181001
+#@ Author : Claudio Kuenzler
+#@ Reason : python3 compatibility
+#@---------------------------------------------------
+#@ Date   : 20190510
+#@ Author : Claudio Kuenzler
+#@ Reason : Allow regular expressions from ignore list (-r)
+#@---------------------------------------------------
+#@ Date   : 20190701
+#@ Author : Phil Randal (phil.randal@gmail.com)
+#@ Reason : Fix lookup of warranty info for Dell (again)
 
+from __future__ import print_function
 import sys
 import time
 import pywbem
@@ -251,7 +276,7 @@ import re
 import pkg_resources
 from optparse import OptionParser,OptionGroup
 
-version = '20161013'
+version = '20190701'
 
 NS = 'root/cimv2'
 hosturl = ''
@@ -338,6 +363,8 @@ timeout = 0
 
 # elements to ignore (full SEL, broken BIOS, etc)
 ignore_list=[]
+regex_ignore_list=[]
+regex=False
 
 # urlise model and tag numbers (currently only Dell supported, but the code does the right thing for other vendors)
 urlise_country=''
@@ -348,6 +375,7 @@ get_volts   = True
 get_current = True
 get_temp    = True
 get_fan     = True
+get_lcd     = True
 
 # define exit codes
 ExitOK = 0
@@ -420,7 +448,7 @@ def urlised_server_info(vendor, country, server_info):
   #server_inf = server_info
   if vendor == 'dell' :
     # Dell support URLs (idea and tables borrowed from check_openmanage)
-    du = 'http://www.dell.com/support/troubleshooting/' + dell_country(country) + '19/Product/poweredge-'
+    du = 'http://www.dell.com/support/home/' + dell_country(country) + '04/product-support/product/poweredge-'
     if (server_info is not None) :
       p=re.match('(.*)PowerEdge (.*) (.*)',server_info)
       if (p is not None) :
@@ -428,7 +456,7 @@ def urlised_server_info(vendor, country, server_info):
         if md == 'R210 II':
           md='r210-2'
         md=md.lower()
-        server_info = p.group(1) + '<a href="' + du + md + '#ui-tabs-4">PowerEdge ' + p.group(2)+'</a> ' + p.group(3)
+        server_info = p.group(1) + '<a href="' + du + md + '/">PowerEdge ' + p.group(2)+'</a> ' + p.group(3)
   elif vendor == 'hp':
     return server_info
   elif vendor == 'ibm':
@@ -443,8 +471,8 @@ def urlised_server_info(vendor, country, server_info):
 def system_tag_url(vendor,country):
   if vendor == 'dell':
     # Dell support sites
-    supportsite = 'http://www.dell.com/support/troubleshooting/'
-    dellsuffix = 'nodhs1/Index?t=warranty&servicetag='
+    supportsite = 'http://www.dell.com/support/home/'
+    dellsuffix = '19/product-support/servicetag/'
 
     # warranty URLs for different country codes
     return supportsite + dell_country(country) + dellsuffix
@@ -467,14 +495,14 @@ def urlised_serialnumber(vendor,country,SerialNumber):
 
 def verboseoutput(message) :
   if verbose:
-    print "%s %s" % (time.strftime("%Y%m%d %H:%M:%S"), message)
+    print(time.strftime("%Y%m%d %H:%M:%S"), message)
 
 # ----------------------------------------------------------------------
 
 def getopts() :
-  global hosturl,cimport,user,password,vendor,verbose,perfdata,urlise_country,timeout,ignore_list,get_power,get_volts,get_current,get_temp,get_fan
-  usage = "usage: %prog -H hostname -U username -P password [-C port -V system -v -p -I XX]\n" \
-    "example: %prog -H my-shiny-new-vmware-server -U root -P fakepassword -C 5989 -V auto -I uk\n\n" \
+  global hosturl,cimport,user,password,vendor,verbose,perfdata,urlise_country,timeout,ignore_list,regex,get_power,get_volts,get_current,get_temp,get_fan,get_lcd
+  usage = "usage: %prog -H hostname -U username -P password [-C port -V vendor -v -p -I XX -i list,list -r]\n" \
+    "example: %prog -H hostname -U root -P password -C 5989 -V auto -I uk\n\n" \
     "or, verbosely:\n\n" \
     "usage: %prog --host=hostname --user=username --pass=password [--cimport=port --vendor=system --verbose --perfdata --html=XX]\n"
 
@@ -500,6 +528,8 @@ def getopts() :
       help="timeout in seconds - no effect on Windows (default = no timeout)")
   group2.add_option("-i", "--ignore", action="store", type="string", dest="ignore", default="", \
       help="comma-separated list of elements to ignore")
+  group2.add_option("-r", "--regex", action="store_true", dest="regex", default=False, \
+      help="allow regular expression lookup of ignore list")
   group2.add_option("--no-power", action="store_false", dest="get_power", default=True, \
       help="don't collect power performance data")
   group2.add_option("--no-volts", action="store_false", dest="get_volts", default=True, \
@@ -510,20 +540,22 @@ def getopts() :
       help="don't collect temperature performance data")
   group2.add_option("--no-fan", action="store_false", dest="get_fan", default=True, \
       help="don't collect fan performance data")
+  group2.add_option("--no-lcd", action="store_false", dest="get_lcd", default=True, \
+      help="don't collect lcd/front display status")
 
   parser.add_option_group(group1)
   parser.add_option_group(group2)
 
   # check input arguments
   if len(sys.argv) < 2:
-    print "no parameters specified\n"
+    print("no parameters specified\n")
     parser.print_help()
     sys.exit(-1)
   # if first argument starts with 'https://' we have old-style parameters, so handle in old way
   if re.match("https://",sys.argv[1]):
     # check input arguments
     if len(sys.argv) < 5:
-      print "too few parameters\n"
+      print("too few parameters\n")
       parser.print_help()
       sys.exit(-1)
     if len(sys.argv) > 5 :
@@ -541,7 +573,7 @@ def getopts() :
     mandatories = ['host', 'user', 'password']
     for m in mandatories:
       if not options.__dict__[m]:
-        print "mandatory parameter '--" + m + "' is missing\n"
+        print("mandatory parameter '--" + m + "' is missing\n")
         parser.print_help()
         sys.exit(-1)
 
@@ -562,11 +594,13 @@ def getopts() :
     urlise_country=options.urlise_country.lower()
     timeout=options.timeout
     ignore_list=options.ignore.split(',')
+    regex=options.regex
     get_power=options.get_power
     get_volts=options.get_volts
     get_current=options.get_current
     get_temp=options.get_temp
     get_fan=options.get_fan
+    get_lcd=options.get_lcd
 
   # if user or password starts with 'file:', use the first string in file as user, second as password
   if (re.match('^file:', user) or re.match('^file:', password)):
@@ -595,25 +629,39 @@ if os_platform != "win32":
   on_windows = False
   import signal
   def handler(signum, frame):
-    print 'UNKNOWN: Execution time too long!'
+    print('UNKNOWN: Execution time too long!')
     sys.exit(ExitUnknown)
 
 if cimport:
   verboseoutput("Using manually defined CIM port "+cimport)
   hosturl += ':'+cimport 
   
+# Append lcd related elements to ignore list if --no-lcd was used
+verboseoutput("LCD Status: %s" % get_lcd)
+if not get_lcd:
+  ignore_list.append("System Board 1 LCD Cable Pres 0: Connected")
+  ignore_list.append("System Board 1 VGA Cable Pres 0: Connected")
+  ignore_list.append("Front Panel Board 1 FP LCD Cable 0: Connected")
+  ignore_list.append("Front Panel Board 1 FP LCD Cable 0: Config Error")
+
 # connection to host
 verboseoutput("Connection to "+hosturl)
 # pywbem 0.7.0 handling is special, some patched 0.7.0 installations work differently
+try:
+  pywbemversion = pywbem.__version__
+except:
   pywbemversion = pkg_resources.get_distribution("pywbem").version
+else:
+  pywbemversion = 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)")
+    verboseoutput("Connection error, disable SSL certificate verification (probably patched pywbem)")
     wbemclient = pywbem.WBEMConnection(hosturl, (user,password), no_verification=True)
   else:
     verboseoutput("Connection worked")
@@ -639,16 +687,19 @@ ExitMsg = ""
 if vendor=='auto':
   try:
     c=wbemclient.EnumerateInstances('CIM_Chassis')
-  except pywbem.cim_operations.CIMError,args:
+  except pywbem.cim_operations.CIMError as args:
     if ( args[1].find('Socket error') >= 0 ):
-      print "UNKNOWN: %s" %args
+      print("UNKNOWN: {}".format(args))
+      sys.exit (ExitUnknown)
+    elif ( args[1].find('ThreadPool --- Failed to enqueue request') >= 0 ):
+      print("UNKNOWN: {}".format(args))
       sys.exit (ExitUnknown)
     else:
       verboseoutput("Unknown CIM Error: %s" % args)
-  except pywbem.cim_http.AuthError,arg:
+  except pywbem.cim_http.AuthError as arg:
     verboseoutput("Global exit set to UNKNOWN")
     GlobalStatus = ExitUnknown
-    print "UNKNOWN: Authentication Error"
+    print("UNKNOWN: Authentication Error")
     sys.exit (GlobalStatus)
   else:
     man=c[0][u'Manufacturer']
@@ -667,16 +718,19 @@ for classe in ClassesToCheck :
   verboseoutput("Check classe "+classe)
   try:
     instance_list = wbemclient.EnumerateInstances(classe)
-  except pywbem.cim_operations.CIMError,args:
+  except pywbem.cim_operations.CIMError as args:
     if ( args[1].find('Socket error') >= 0 ):
-      print "UNKNOWN: %s" %args
+      print("UNKNOWN: {}".format(args))
+      sys.exit (ExitUnknown)
+    elif ( args[1].find('ThreadPool --- Failed to enqueue request') >= 0 ):
+      print("UNKNOWN: {}".format(args))
       sys.exit (ExitUnknown)
     else:
       verboseoutput("Unknown CIM Error: %s" % args)
-  except pywbem.cim_http.AuthError,arg:
+  except pywbem.cim_http.AuthError as arg:
     verboseoutput("Global exit set to UNKNOWN")
     GlobalStatus = ExitUnknown
-    print "UNKNOWN: Authentication Error"
+    print("UNKNOWN: Authentication Error")
     sys.exit (GlobalStatus)
   else:
     # GlobalStatus = ExitOK #ARR
@@ -688,7 +742,13 @@ for classe in ClassesToCheck :
       verboseoutput("  Element Name = "+elementName)
 
       # Ignore element if we don't want it
-      if elementName in ignore_list :
+      if (regex == True) and (len(ignore_list) > 0) :
+        for ignore in ignore_list :
+          if re.search(ignore, elementName, re.IGNORECASE) :
+            verboseoutput("    (ignored through regex)")
+            regex_ignore_list.append(elementName)
+
+      if (elementName in ignore_list) or (elementName in regex_ignore_list) :
         verboseoutput("    (ignored)")
         continue
 
@@ -788,7 +848,6 @@ for classe in ClassesToCheck :
         verboseoutput("    Family = %d" % instance['Family'])
         verboseoutput("    CurrentClockSpeed = %dMHz" % instance['CurrentClockSpeed'])
 
-
       # HP Check
       if vendor == "hp" :
         if instance['HealthState'] is not None :
@@ -804,11 +863,11 @@ for classe in ClassesToCheck :
             30 : ExitCritical,  # Non-recoverable Error
           }[elementStatus]
           if (interpretStatus == ExitCritical) :
-            verboseoutput("GLobal exit set to CRITICAL")
+            verboseoutput("Global exit set to CRITICAL")
             GlobalStatus = ExitCritical
             ExitMsg += " CRITICAL : %s " % elementNameValue
           if (interpretStatus == ExitWarning and GlobalStatus != ExitCritical) :
-            verboseoutput("GLobal exit set to WARNING")
+            verboseoutput("Global exit set to WARNING")
             GlobalStatus = ExitWarning
             ExitMsg += " WARNING : %s " % elementNameValue
           # Added the following for when GlobalStatus is ExitCritical and a warning is detected
@@ -825,8 +884,6 @@ for classe in ClassesToCheck :
       elif (vendor == "dell" or vendor == "intel" or vendor == "ibm" or vendor=="unknown") :
         # Added 20121027 As long as Dell doesnt correct these CIM elements return code we have to ignore it
         ignore_list.append("System Board 1 Riser Config Err 0: Connected")
-        ignore_list.append("System Board 1 LCD Cable Pres 0: Connected")
-        ignore_list.append("System Board 1 VGA Cable Pres 0: Connected")
         ignore_list.append("Add-in Card 4 PEM Presence 0: Connected")
         if instance['OperationalStatus'] is not None :
           elementStatus = instance['OperationalStatus'][0]
@@ -859,7 +916,7 @@ for classe in ClassesToCheck :
             GlobalStatus = ExitCritical
             ExitMsg += " CRITICAL : %s " % elementNameValue
           if (interpretStatus == ExitWarning and GlobalStatus != ExitCritical) :
-            verboseoutput("GLobal exit set to WARNING")
+            verboseoutput("Global exit set to WARNING")
             GlobalStatus = ExitWarning
             ExitMsg += " WARNING : %s " % elementNameValue
           # Added same logic as in 20100702 here, otherwise Dell servers would return UNKNOWN instead of OK
@@ -903,12 +960,12 @@ if perf == '|':
   perf = ''
 
 if GlobalStatus == ExitOK :
-  print "OK - Server: %s %s %s%s" % (server_info, SerialNumber, bios_info, perf)
+  print("OK - Server: %s %s %s%s" % (server_info, SerialNumber, bios_info, perf))
 
 elif GlobalStatus == ExitUnknown :
-  print "UNKNOWN: %s" % (ExitMsg) #ARR
+  print("UNKNOWN: %s" % (ExitMsg)) #ARR
 
 else:
-  print "%s- Server: %s %s %s%s" % (ExitMsg, server_info, SerialNumber, bios_info, perf)
+  print("%s - Server:  %s %s %s%s" % (ExitMsg, server_info, SerialNumber, bios_info, perf))
 
 sys.exit (GlobalStatus)