Update changelog and version

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Before actually creating a new issue**
-I confirm, I have read the FAQ (https://www.claudiokuenzler.com/blog/308/check-esxi-hardware-faq-frequently-asked-questions): Y/N
-I confirm, I have restarted the CIM server (` /etc/init.d/sfcbd-watchdog restart `) on the ESXi server and the problem remains: Y/N
-I confirm, I have cleared the server's local IPMI cache (`localcli hardware ipmi sel clear`) and restarted the services (`/sbin/services.sh restart`) on the ESXi server and the problem remains: Y/N
-
-**Describe the bug**
-A clear and concise description of what the bug is. 
-
-**Show the full plugin output, including the command with -V parameter**
-Run the plugin with `-V` parameter and show the full output (including command) here. Obviously obfuscate credentials.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Versions:**
- - check_esxi_hardware plugin: 
- - VMware ESXi:
- - pywbem: 
- - Python:
- - Third party tools (Dell OMSA, HP Offline Bundle, etc): 
-
-**Additional context**
-Add any other context about the problem here.

README.md

@@ -9,7 +9,3 @@ This is the public git repository for development of the plugin.
 Documentation + Production Ready Plugin
 -------------
 Please refer to https://www.claudiokuenzler.com/monitoring-plugins/check_esxi_hardware.php 
-
-Compatibility list
--------------
-Please check https://www.claudiokuenzler.com/blog/1110/check_esxi_hardware-esxi-compatibility-matrix-list for a (non conclusive) matrix of known working versions.

check_esxi_hardware.py

@@ -22,7 +22,7 @@
 # Copyright (c) 2008 David Ligeret
 # Copyright (c) 2009 Joshua Daniel Franklin
 # Copyright (c) 2010 Branden Schneider
-# Copyright (c) 2010-2022 Claudio Kuenzler
+# Copyright (c) 2010-2021 Claudio Kuenzler
 # Copyright (c) 2010 Samir Ibradzic
 # Copyright (c) 2010 Aaron Rogers
 # Copyright (c) 2011 Ludovic Hutin
@@ -38,7 +38,6 @@
 # Copyright (c) 2015 Stefan Roos
 # Copyright (c) 2018 Peter Newman
 # Copyright (c) 2020 Luca Berra
-# Copyright (c) 2022 Marco Markgraf
 #
 # 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
@@ -285,10 +284,7 @@
 #@ Author : Claudio Kuenzler
 #@ Reason : Fix TLSv1 usage (issue #51)
 #@---------------------------------------------------
-#@ Date   : 20220509
+
-#@ Author : Marco Markgraf
-#@ Reason : Added JSON-output (Zabbix needs it)
-#@---------------------------------------------------
 
 from __future__ import print_function
 import sys
@@ -296,10 +292,9 @@ import time
 import pywbem
 import re
 import pkg_resources
-import json
 from optparse import OptionParser,OptionGroup
 
-version = '20220708'
+version = '20210809'
 
 NS = 'root/cimv2'
 hosturl = ''
@@ -347,7 +342,6 @@ sensor_Type = {
 }
 
 data = []
-xdata = {}
 
 perf_Prefix = {
   1:'Pow',
@@ -379,10 +373,6 @@ vendor='unknown'
 # verbose
 verbose=False
 
-# output json
-format='string'
-pretty=False
-
 # Produce performance data output for nagios
 perfdata=False
 
@@ -528,20 +518,12 @@ def verboseoutput(message) :
 
 # ----------------------------------------------------------------------
 
-def xdataprint():
-  if format == 'json' and not pretty:
-    print(json.dumps(xdata, sort_keys=True))
-  if format == 'json' and pretty:
-    print(json.dumps(xdata, sort_keys=True, indent=4))
-
-# ----------------------------------------------------------------------
-
 def getopts() :
-  global hosturl,hostname,cimport,sslproto,user,password,vendor,verbose,perfdata,urlise_country,timeout,ignore_list,regex,get_power,get_volts,get_current,get_temp,get_fan,get_lcd,get_intrusion,format,pretty
+  global hosturl,hostname,cimport,sslproto,user,password,vendor,verbose,perfdata,urlise_country,timeout,ignore_list,regex,get_power,get_volts,get_current,get_temp,get_fan,get_lcd,get_intrusion
   usage = "usage: %prog -H hostname -U username -P password [-C port -S proto -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 --sslproto=version --vendor=system --verbose --perfdata --html=XX --format=json --pretty]\n"
+    "usage: %prog --host=hostname --user=username --pass=password [--cimport=port --sslproto=version --vendor=system --verbose --perfdata --html=XX]\n"
 
   parser = OptionParser(usage=usage, version="%prog "+version)
   group1 = OptionGroup(parser, 'Mandatory parameters')
@@ -582,10 +564,6 @@ def getopts() :
       help="don't collect lcd/front display status")
   group2.add_option("--no-intrusion", action="store_false", dest="get_intrusion", default=True, \
       help="don't collect chassis intrusion status")
-  group2.add_option("--format", dest="format", help="'string' (default) or 'json'", \
-      metavar="FORMAT", type='choice', choices=['string','json'],default="string")
-  group2.add_option("--pretty", action="store_true", dest="pretty", default=False, \
-      help="return data as a pretty-printed json-array")
 
   parser.add_option_group(group1)
   parser.add_option_group(group2)
@@ -632,16 +610,14 @@ def getopts() :
     user=options.user
     password=options.password
     cimport=options.cimport
-    ignore_list=options.ignore.split(',')
-    format=options.format
-    pretty=options.pretty
-    perfdata=options.perfdata
-    regex=options.regex
     sslproto=options.sslproto
-    timeout=options.timeout
-    urlise_country=options.urlise_country.lower()
     vendor=options.vendor.lower()
     verbose=options.verbose
+    perfdata=options.perfdata
+    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
@@ -802,7 +778,7 @@ for classe in ClassesToCheck :
   verboseoutput("Check classe "+classe)
   try:
     instance_list = wbemclient.EnumerateInstances(classe)
-  except pywbem._cim_operations.CIMError as args:
+  except pywbem.cim_operations.CIMError as args:
     if ( args[1].find('Socket error') >= 0 ):
       print("UNKNOWN: {}".format(args))
       sys.exit (ExitUnknown)
@@ -815,7 +791,7 @@ for classe in ClassesToCheck :
     GlobalStatus = ExitUnknown
     print("UNKNOWN: {}".format(args))
     sys.exit (GlobalStatus)
-  except pywbem._cim_http.AuthError as arg:
+  except pywbem.cim_http.AuthError as arg:
     verboseoutput("Global exit set to UNKNOWN")
     GlobalStatus = ExitUnknown
     print("UNKNOWN: Authentication Error")
@@ -847,8 +823,6 @@ for classe in ClassesToCheck :
             + str(instance[u'ReleaseDate'].datetime.date())
         verboseoutput("    VersionString = "+instance[u'VersionString'])
 
-        xdata['Bios Info'] = bios_info
-
       elif elementName == 'Chassis' :
         man = instance[u'Manufacturer']
         if man is None :
@@ -863,8 +837,7 @@ for classe in ClassesToCheck :
           model = instance[u'Model']
           if model:
             verboseoutput("    Model = "+model)
-            #server_info +=  model + ' s/n:'
+            server_info +=  model + ' s/n:'
-            server_info +=  model
 
       elif elementName == 'Server Blade' :
         SerialNumber = instance[u'SerialNumber']
@@ -872,8 +845,6 @@ for classe in ClassesToCheck :
           verboseoutput("    SerialNumber = "+SerialNumber)
           isblade = "yes"
 
-      xdata['SerialNumber'] = SerialNumber
-
       # Report detail of Numeric Sensors and generate nagios perfdata
 
       if classe == "CIM_NumericSensor" :
@@ -915,33 +886,27 @@ for classe in ClassesToCheck :
             if units == 7:            # Watts
               if get_power:
                 data.append( ("%s=%g;%g;%g " % (perf_el, cr, utnc, utc),1) )
-                xdata[perf_el] = { 'Unit': 'Watt', 'Value': cr, 'warn' : utnc, 'crit': utc }
             elif units == 6:          # Current
               if get_current:
                 data.append( ("%s=%g;%g;%g " % (perf_el, cr, utnc, utc),3) )
-                xdata[perf_el] = { 'Unit': 'Ampere', 'Value': cr, 'warn' : utnc, 'crit': utc }
 
           # PSU Voltage
           elif sensorType == 3:               # Voltage
             if get_volts:
               data.append( ("%s=%g;%g;%g " % (perf_el, cr, utnc, utc),2) )
-              xdata[perf_el] = { 'Unit': 'Volt', 'Value': cr, 'warn' : utnc, 'crit': utc }
 
           # Temperatures
           elif sensorType == 2:               # Temperature
             if get_temp:
               data.append( ("%s=%g;%g;%g " % (perf_el, cr, utnc, utc),4) )
-              xdata[perf_el] = { 'Value': cr, 'warn' : utnc, 'crit': utc }
 
           # Fan speeds
           elif sensorType == 5:               # Tachometer
             if get_fan:
-              if units == 65:                 # percentage
+              if units == 65:           # percentage
                 data.append( ("%s=%g%%;%g;%g " % (perf_el, cr, utnc, utc),6) )
-                xdata[perf_el] = { 'Unit': '%', 'Value': cr, 'warn' : utnc, 'crit': utc }
               else:
                 data.append( ("%s=%g;%g;%g " % (perf_el, cr, utnc, utc),5) )
-                xdata[perf_el] = { 'Value': cr, 'warn' : utnc, 'crit': utc }
 
       elif classe == "CIM_Processor" :
         verboseoutput("    Family = %d" % instance['Family'])
@@ -1037,7 +1002,6 @@ if (urlise_country != '') :
 # If this is a blade server, also output chassis serial number as additional info
 if (isblade == "yes") :
   SerialNumber += " Chassis S/N: %s " % (SerialChassis)
-  xdata['ChassisSerialNumber'] = SerialChassis
 
 # Output performance data
 perf = '|'
@@ -1063,24 +1027,13 @@ if perf == '|':
 if sslproto:
   os.remove(sslconfpath)
 
-xdata['GlobalStatus'] = GlobalStatus
-
 if GlobalStatus == ExitOK :
-  if format == 'string':
+  print("OK - Server: %s %s %s%s" % (server_info, SerialNumber, bios_info, perf))
-    print("OK - Server: %s %s %s%s" % (server_info, 's/n: ' + SerialNumber, bios_info, perf))
-  else:
-    xdataprint()
 
 elif GlobalStatus == ExitUnknown :
-  if format == 'string':
+  print("UNKNOWN: %s" % (ExitMsg)) #ARR
-    print("UNKNOWN: %s" % (ExitMsg)) #ARR
-  else:
-    xdataprint()
 
 else:
-  if format == 'string':
+  print("%s - Server:  %s %s %s%s" % (ExitMsg, server_info, SerialNumber, bios_info, perf))
-    print("%s - Server:  %s %s %s%s" % (ExitMsg, server_info, 's/n: ' + SerialNumber, bios_info, perf))
-  else:
-    xdataprint()
 
 sys.exit (GlobalStatus)