gitorious/nagios-http-json
1
0
Fork 0
mirror of https://github.com/drewkerrigan/nagios-http-json.git synced 2024-11-22 10:23:50 +01:00
Code Issues Releases Wiki Activity

fixed minor bugs and added compatibility for RHEL/CentOS 7.x

Browse Source 
* change ssl.PROTOCOL_TLS to ssl.PROTOCOL_SSLv23
* fixed bug that response var not passed outside try/except block
* fixed arrer in nagios.append_metrics()
This commit is contained in:
Ricardo Bartels 2019-05-09 16:39:41 +02:00
parent 7858382bbe
commit 47547951cf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
check_http_json.py
View File

@ -69,8 +69,8 @@ class NagiosHelper:
def append_unknown(self, unknown_message): def append_unknown(self, unknown_message):
self.unknown_message += unknown_message self.unknown_message += unknown_message
def append_metrics(self, performance_data, def append_metrics(self, (performance_data,
warning_message, critical_message): warning_message, critical_message)):
self.performance_data += performance_data self.performance_data += performance_data
self.append_warning(warning_message) self.append_warning(warning_message)
self.append_critical(critical_message) self.append_critical(critical_message)
@ -689,7 +689,7 @@ if __name__ == "__main__":
if args.ssl: if args.ssl:
url = "https://%s" % args.host url = "https://%s" % args.host
context = ssl.SSLContext(ssl.PROTOCOL_TLS) context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
context.options |= ssl.OP_NO_SSLv2 context.options |= ssl.OP_NO_SSLv2
context.options |= ssl.OP_NO_SSLv3 context.options |= ssl.OP_NO_SSLv3
@ -729,6 +729,7 @@ if __name__ == "__main__":
if args.path: if args.path:
url += "/%s" % args.path url += "/%s" % args.path
debugPrint(args.debug, "url:%s" % url) debugPrint(args.debug, "url:%s" % url)
json_data = ''
try: try:
req = urllib2.Request(url) req = urllib2.Request(url)
req.add_header("User-Agent", "check_http_json") req.add_header("User-Agent", "check_http_json")
@ -750,13 +751,16 @@ if __name__ == "__main__":
response = urllib2.urlopen(req, data=args.data, context=context) response = urllib2.urlopen(req, data=args.data, context=context)
else: else:
response = urllib2.urlopen(req, context=context) response = urllib2.urlopen(req, context=context)
json_data = response.read()
except HTTPError as e: except HTTPError as e:
nagios.append_unknown(" HTTPError[%s], url:%s" % (str(e.code), url)) nagios.append_unknown(" HTTPError[%s], url:%s" % (str(e.code), url))
except URLError as e: except URLError as e:
nagios.append_critical(" URLError[%s], url:%s" % (str(e.reason), url)) nagios.append_critical(" URLError[%s], url:%s" % (str(e.reason), url))
try: try:
data = json.loads(response.read()) data = json.loads(json_data)
except ValueError as e: except ValueError as e:
nagios.append_unknown(" Parser error: %s" % str(e)) nagios.append_unknown(" Parser error: %s" % str(e))