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

Merge pull request #62 from drewkerrigan/key-equals-empty

Browse Source 
Add handling of empty JSON return values
This commit is contained in:
Markus Opolka 2020-07-03 09:04:53 +02:00 committed by GitHub
commit a014944981
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
check_http_json.py
View File

@ -225,9 +225,9 @@ class JsonRuleProcessor:
if self.rules.value_separator: if self.rules.value_separator:
value_separator = self.rules.value_separator value_separator = self.rules.value_separator
self.helper = JsonHelper(self.data, separator, value_separator) self.helper = JsonHelper(self.data, separator, value_separator)
debugPrint(rules_args.debug, "rules:%s" % rules_args) debugPrint(rules_args.debug, "rules: %s" % rules_args)
debugPrint(rules_args.debug, "separator:%s" % separator) debugPrint(rules_args.debug, "separator: %s" % separator)
debugPrint(rules_args.debug, "value_separator:%s" % value_separator) debugPrint(rules_args.debug, "value_separator: %s" % value_separator)
self.metric_list = self.expandKeys(self.rules.metric_list) self.metric_list = self.expandKeys(self.rules.metric_list)
self.key_threshold_warning = self.expandKeys( self.key_threshold_warning = self.expandKeys(
self.rules.key_threshold_warning) self.rules.key_threshold_warning)
@ -346,6 +346,8 @@ class JsonRuleProcessor:
def checkCritical(self): def checkCritical(self):
failure = '' failure = ''
if not self.data:
failure = " Empty JSON data."
if self.key_threshold_critical is not None: if self.key_threshold_critical is not None:
failure += self.checkThresholds(self.key_threshold_critical) failure += self.checkThresholds(self.key_threshold_critical)
if self.key_value_list_critical is not None: if self.key_value_list_critical is not None:

22
test/test_check_http_json.py
View File

@ -256,7 +256,7 @@ class UtilTest(unittest.TestCase):
# This should not throw a KeyError # This should not throw a KeyError
data = '{}' data = '{}'
self.check_data(rules.dash_q(['(0).Node,foobar', '(1).Node,missing']), data, WARNING_CODE) self.check_data(rules.dash_q(['(0).Node,foobar', '(1).Node,missing']), data, CRITICAL_CODE)
def test_subelem(self): def test_subelem(self):
@ -274,3 +274,23 @@ class UtilTest(unittest.TestCase):
self.check_data(rules.dash_E(['(*).capacity.value.too_deep']), data, CRITICAL_CODE) self.check_data(rules.dash_E(['(*).capacity.value.too_deep']), data, CRITICAL_CODE)
# Should not throw keyerror # Should not throw keyerror
self.check_data(rules.dash_E(['foo']), data, CRITICAL_CODE) self.check_data(rules.dash_E(['foo']), data, CRITICAL_CODE)
def test_empty_key_value_array(self):
"""
https://github.com/drewkerrigan/nagios-http-json/issues/61
"""
rules = RulesHelper()
# This should simply work
data = '[{"update_status": "finished"},{"update_status": "finished"}]'
self.check_data(rules.dash_q(['(*).update_status,finished']), data, OK_CODE)
# This should warn us
data = '[{"update_status": "finished"},{"update_status": "failure"}]'
self.check_data(rules.dash_q(['(*).update_status,finished']), data, WARNING_CODE)
# This should throw an error
data = '[]'
self.check_data(rules.dash_q(['(*).update_status,warn_me']), data, CRITICAL_CODE)

2
test/test_main.py
View File

@ -12,7 +12,7 @@ from check_http_json import main
class MockResponse(): class MockResponse():
def __init__(self, status_code=200, content='{}'): def __init__(self, status_code=200, content='{"foo": "bar"}'):
self.status_code = status_code self.status_code = status_code
self.content = content self.content = content