From cec24c19bdbf9d2495c6f97d5f16d0511cc55f48 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Thu, 31 Aug 2017 21:19:34 +0200 Subject: [PATCH 1/7] Added --no-lcd option --- check_esxi_hardware.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index cf70e83..44d4ae8 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -348,6 +348,7 @@ get_volts = True get_current = True get_temp = True get_fan = True +get_lcd = True # define exit codes ExitOK = 0 @@ -472,7 +473,7 @@ def verboseoutput(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 + global hosturl,cimport,user,password,vendor,verbose,perfdata,urlise_country,timeout,ignore_list,get_power,get_volts,get_current,get_temp,get_fan,get_lcd 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" \ "or, verbosely:\n\n" \ @@ -510,6 +511,8 @@ 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) @@ -567,6 +570,7 @@ def getopts() : 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)): @@ -788,6 +792,11 @@ for classe in ClassesToCheck : verboseoutput(" Family = %d" % instance['Family']) verboseoutput(" CurrentClockSpeed = %dMHz" % instance['CurrentClockSpeed']) + # Append lcd related elements to ignore list if --no-lcd was used + if 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") # HP Check if vendor == "hp" : @@ -804,11 +813,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 +834,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 +866,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 From ff33e0a7b87f67cbcc5002349c5e8e7c8e2ab602 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Fri, 1 Sep 2017 07:05:54 +0200 Subject: [PATCH 2/7] Debugging --no-lcd --- check_esxi_hardware.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index 44d4ae8..7cd5b8d 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -793,7 +793,8 @@ for classe in ClassesToCheck : verboseoutput(" CurrentClockSpeed = %dMHz" % instance['CurrentClockSpeed']) # Append lcd related elements to ignore list if --no-lcd was used - if get_lcd: + verboseoutput("LCD Status: %s" % get_lcd) + if get_lcd == "True": 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") From 7d4a85d0f39f12ce6401e63a9ec8e0c632d63c73 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Fri, 1 Sep 2017 16:49:19 +0200 Subject: [PATCH 3/7] Update check_esxi_hardware.py --- check_esxi_hardware.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index 7cd5b8d..63101ec 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -794,7 +794,7 @@ for classe in ClassesToCheck : # Append lcd related elements to ignore list if --no-lcd was used verboseoutput("LCD Status: %s" % get_lcd) - if get_lcd == "True": + if get_lcd == "False": 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") From 9ea8ba5967c2a9bdef82627eb53c197b0630e280 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Sat, 2 Sep 2017 11:21:31 +0200 Subject: [PATCH 4/7] Corected lcd condition --- check_esxi_hardware.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index 63101ec..49db290 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -694,7 +694,14 @@ for classe in ClassesToCheck : # Ignore element if we don't want it if elementName in ignore_list : verboseoutput(" (ignored)") - continue + continue + + # 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") # BIOS & Server info if elementName == 'System BIOS' : @@ -792,13 +799,6 @@ for classe in ClassesToCheck : verboseoutput(" Family = %d" % instance['Family']) verboseoutput(" CurrentClockSpeed = %dMHz" % instance['CurrentClockSpeed']) - # Append lcd related elements to ignore list if --no-lcd was used - verboseoutput("LCD Status: %s" % get_lcd) - if get_lcd == "False": - 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") - # HP Check if vendor == "hp" : if instance['HealthState'] is not None : From 0e62849ffb5e2d4d44da7112f957b870c440fb4c Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Sat, 2 Sep 2017 11:24:37 +0200 Subject: [PATCH 5/7] Define lcd ignore list before checking classes --- check_esxi_hardware.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index 49db290..6ea0e0d 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -605,6 +605,13 @@ if os_platform != "win32": 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") # connection to host verboseoutput("Connection to "+hosturl) @@ -695,13 +702,6 @@ for classe in ClassesToCheck : if elementName in ignore_list : verboseoutput(" (ignored)") continue - - # 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") # BIOS & Server info if elementName == 'System BIOS' : From 575c4b47a70a5941bdd8d660753e859d063a6295 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Tue, 5 Sep 2017 21:06:53 +0200 Subject: [PATCH 6/7] Ready for new version --- check_esxi_hardware.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index 6ea0e0d..c607262 100755 --- a/check_esxi_hardware.py +++ b/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-2017 Claudio Kuenzler # Copyright (c) 2010 Samir Ibradzic # Copyright (c) 2010 Aaron Rogers # Copyright (c) 2011 Ludovic Hutin @@ -243,6 +243,10 @@ #@ 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) +#@--------------------------------------------------- import sys import time @@ -251,7 +255,7 @@ import re import pkg_resources from optparse import OptionParser,OptionGroup -version = '20161013' +version = '20170905' NS = 'root/cimv2' hosturl = '' @@ -612,6 +616,7 @@ 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) From bd61850aa5b4deb693e734ddc2f9496a555a5156 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Thu, 29 Mar 2018 09:15:07 +0200 Subject: [PATCH 7/7] Try to use internal pywbem function to determine version --- check_esxi_hardware.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index c607262..0e67def 100755 --- a/check_esxi_hardware.py +++ b/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-2017 Claudio Kuenzler +# Copyright (c) 2010-2018 Claudio Kuenzler # Copyright (c) 2010 Samir Ibradzic # Copyright (c) 2010 Aaron Rogers # Copyright (c) 2011 Ludovic Hutin @@ -247,6 +247,10 @@ #@ 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 +#@--------------------------------------------------- import sys import time @@ -255,7 +259,7 @@ import re import pkg_resources from optparse import OptionParser,OptionGroup -version = '20170905' +version = '20180329' NS = 'root/cimv2' hosturl = '' @@ -621,8 +625,14 @@ if not get_lcd: # connection to host verboseoutput("Connection to "+hosturl) # pywbem 0.7.0 handling is special, some patched 0.7.0 installations work differently -pywbemversion = pkg_resources.get_distribution("pywbem").version +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))