Monitoring/check_esxi_hardware
1
0
Fork 0
mirror of https://github.com/Napsty/check_esxi_hardware.git synced 2024-10-22 12:13:46 +02:00
Code Issues Releases Wiki Activity

Fix reported issues #47 and #48 (#49)

Browse Source
This commit is contained in:
Claudio Kuenzler 2020-07-10 07:30:43 +02:00 committed by GitHub
parent 274dceee74
commit d8f9fa1c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
check_esxi_hardware.py
View File

@ -275,6 +275,11 @@
#@ Author : Claudio Kuenzler #@ Author : Claudio Kuenzler
#@ Reason : Add parameter (-S) for custom SSL/TLS protocol version #@ Reason : Add parameter (-S) for custom SSL/TLS protocol version
#@--------------------------------------------------- #@---------------------------------------------------
#@ Date : 20200710
#@ Author : Claudio Kuenzler
#@ Reason : Improve missing mandatory parameter error text (issue #47)
#@ Delete temporary openssl config file after use (issue #48)
#@---------------------------------------------------
from __future__ import print_function from __future__ import print_function
import sys import sys
@ -284,7 +289,7 @@ import re
import pkg_resources import pkg_resources
from optparse import OptionParser,OptionGroup from optparse import OptionParser,OptionGroup
version = '20200605' version = '20200710'
NS = 'root/cimv2' NS = 'root/cimv2'
hosturl = '' hosturl = ''
@ -585,7 +590,7 @@ def getopts() :
mandatories = ['host', 'user', 'password'] mandatories = ['host', 'user', 'password']
for m in mandatories: for m in mandatories:
if not options.__dict__[m]: if not options.__dict__[m]:
print("mandatory parameter '--" + m + "' is missing\n") print("mandatory option '" + m + "' not defined. read usage in help.\n")
parser.print_help() parser.print_help()
sys.exit(-1) sys.exit(-1)
@ -1013,6 +1018,10 @@ if perfdata:
if perf == '|': if perf == '|':
perf = '' perf = ''
# Cleanup temporary openssl config
if sslproto:
os.remove(sslconfpath)
if GlobalStatus == ExitOK : 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))