From 629911c8de9a586a7d2dfb97c4d3453140fced40 Mon Sep 17 00:00:00 2001 From: Napsty Date: Tue, 9 Sep 2014 17:28:53 +0200 Subject: [PATCH 1/3] Output serial number of chassis if a blade server is checked --- check_esxi_hardware.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index b179174..49d4f54 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -207,6 +207,10 @@ #@ Author : Claudio Kuenzler (www.claudiokuenzler.com) #@ Reason : Another two workarounds for Dell systems (VGA Cable Pres 0, Add-in Card 4 PEM Presence 0) #@--------------------------------------------------- +#@ Date : 20140909 +#@ Author : Claudio Kuenzler (www.claudiokuenzler.com) +#@ Reason : Output serial number of chassis if a blade server is checked +#@--------------------------------------------------- import sys import time @@ -642,6 +646,7 @@ for classe in ClassesToCheck : man = 'Unknown Manufacturer' verboseoutput(" Manufacturer = "+man) SerialNumber = instance[u'SerialNumber'] + SerialChassis = instance[u'SerialNumber'] if SerialNumber: verboseoutput(" SerialNumber = "+SerialNumber) server_info = man + ' ' @@ -655,6 +660,7 @@ for classe in ClassesToCheck : SerialNumber = instance[u'SerialNumber'] if SerialNumber: verboseoutput(" SerialNumber = "+SerialNumber) + isblade = "yes" # Report detail of Numeric Sensors and generate nagios perfdata @@ -813,6 +819,10 @@ if (urlise_country != '') : SerialNumber = urlised_serialnumber(vendor,urlise_country,SerialNumber) server_info = urlised_server_info(vendor,urlise_country,server_info) +# If this is a blade server, also output chassis serial number as additional info +if (isblade == "yes") : + SerialNumber += " Chassis S/N: %s " % (SerialChassis) + # Output performance data perf = '|' if perfdata: From 6abc24f522891d3f4045b59b7bcf3a57f21ee7a1 Mon Sep 17 00:00:00 2001 From: Napsty Date: Tue, 9 Sep 2014 17:30:55 +0200 Subject: [PATCH 2/3] Removed autoindent, added spaced instead --- 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 49d4f54..66bf4c2 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -660,7 +660,7 @@ for classe in ClassesToCheck : SerialNumber = instance[u'SerialNumber'] if SerialNumber: verboseoutput(" SerialNumber = "+SerialNumber) - isblade = "yes" + isblade = "yes" # Report detail of Numeric Sensors and generate nagios perfdata From d67db0b2ff4a0043ee6594b71f692ce0926902f8 Mon Sep 17 00:00:00 2001 From: Napsty Date: Tue, 16 Sep 2014 13:27:48 +0200 Subject: [PATCH 3/3] Fixed uninitialized variable isblade --- check_esxi_hardware.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index 66bf4c2..0b312e0 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -207,7 +207,7 @@ #@ Author : Claudio Kuenzler (www.claudiokuenzler.com) #@ Reason : Another two workarounds for Dell systems (VGA Cable Pres 0, Add-in Card 4 PEM Presence 0) #@--------------------------------------------------- -#@ Date : 20140909 +#@ Date : 20140916 #@ Author : Claudio Kuenzler (www.claudiokuenzler.com) #@ Reason : Output serial number of chassis if a blade server is checked #@--------------------------------------------------- @@ -219,7 +219,7 @@ import re import string from optparse import OptionParser,OptionGroup -version = '20140319' +version = '20140916' NS = 'root/cimv2' @@ -319,6 +319,9 @@ ExitWarning = 1 ExitCritical = 2 ExitUnknown = 3 +# Special handling for blade servers +isblade = "no" + def dell_country(country): if country == 'at': # Austria return 'at/de/'