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

Add JSON parsing on HTTPError

Browse Source 
- Only if response contains JSON
This commit is contained in:
Markus Opolka 2020-06-19 14:26:59 +02:00
parent d1e585b2dd
commit f7c0472cdc
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
check_http_json.py
View File

@ -609,7 +609,11 @@ def main(cliargs):
json_data = response.read() json_data = response.read()
except HTTPError as e: except HTTPError as e:
nagios.append_unknown(" HTTPError[%s], url:%s" % (str(e.code), url)) # Try to recover from HTTP Error, if there is JSON in the response
if "json" in e.info().get_content_subtype():
json_data = e.read()
else:
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))

39
test/test_main.py
View File

@ -50,7 +50,7 @@ class MainTest(unittest.TestCase):
@mock.patch('builtins.print') @mock.patch('builtins.print')
@mock.patch('urllib.request.urlopen') @mock.patch('urllib.request.urlopen')
def test_main_with_error(self, mock_request, mock_print): def test_main_with_parse_error(self, mock_request, mock_print):
args = '-H localhost'.split(' ') args = '-H localhost'.split(' ')
mock_request.return_value = MockResponse(content='not JSON') mock_request.return_value = MockResponse(content='not JSON')
@ -58,5 +58,40 @@ class MainTest(unittest.TestCase):
with self.assertRaises(SystemExit) as test: with self.assertRaises(SystemExit) as test:
main(args) main(args)
# Returns Parser Error self.assertTrue('Parser error' in str(mock_print.call_args))
self.assertEqual(test.exception.code, 3) self.assertEqual(test.exception.code, 3)
@mock.patch('builtins.print')
def test_main_with_url_error(self, mock_print):
args = '-H localhost'.split(' ')
with self.assertRaises(SystemExit) as test:
main(args)
self.assertTrue('URLError' in str(mock_print.call_args))
self.assertEqual(test.exception.code, 3)
@mock.patch('builtins.print')
@mock.patch('urllib.request.urlopen')
def test_main_with_http_error_no_json(self, mock_request, mock_print):
args = '-H localhost'.split(' ')
mock_request.return_value = MockResponse(content='not JSON', status_code=503)
with self.assertRaises(SystemExit) as test:
main(args)
self.assertTrue('Parser error' in str(mock_print.call_args))
self.assertEqual(test.exception.code, 3)
@mock.patch('builtins.print')
@mock.patch('urllib.request.urlopen')
def test_main_with_http_error_valid_json(self, mock_request, mock_print):
args = '-H localhost'.split(' ')
mock_request.return_value = MockResponse(status_code=503)
with self.assertRaises(SystemExit) as test:
main(args)
self.assertEqual(test.exception.code, 0)