gitorious/nagios-http-json
1
0
Fork 0
mirror of https://github.com/drewkerrigan/nagios-http-json.git synced 2025-05-10 18:03:45 +02:00
Code Issues Releases Wiki Activity

Display value in validation result.

Browse Source 
Example:
WARNING: Status WARNING. Value '85' for key RoutersWithoutLocation was outside the range 0:84.
This commit is contained in:
marxin 2019-04-28 09:10:07 +02:00
parent 357c2240ba
commit fbe37fc373
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
check_http_json.py
View File

@ -161,7 +161,8 @@ class JsonRuleProcessor:
k, v = kv.split(',') k, v = kv.split(',')
key, alias = _getKeyAlias(k) key, alias = _getKeyAlias(k)
if (self.helper.equals(key, v) == False): if (self.helper.equals(key, v) == False):
failure += " Value for key %s did not match %s." % (alias, v) value = str(self.helper.get(key))
failure += " Value '%s' for key %s did not match %s." % (value, alias, v)
return failure return failure
def checkThreshold(self, key, alias, r): def checkThreshold(self, key, alias, r):
@ -179,21 +180,22 @@ class JsonRuleProcessor:
start = vals[0] start = vals[0]
if vals[1] != '': if vals[1] != '':
end = vals[1] end = vals[1]
value = str(self.helper.get(key))
if(start == '~'): if(start == '~'):
if (invert and self.helper.lte(key, end)): if (invert and self.helper.lte(key, end)):
failure += " Value for key %s was less than or equal to %s." % (alias, end) failure += " Value '%s' for key %s was less than or equal to %s." % (value, alias, end)
elif (not invert and self.helper.gt(key, end)): elif (not invert and self.helper.gt(key, end)):
failure += " Value for key %s was greater than %s." % (alias, end) failure += " Value '%s' for key %s was greater than %s." % (value, alias, end)
elif(end == 'infinity'): elif(end == 'infinity'):
if (invert and self.helper.gte(key, start)): if (invert and self.helper.gte(key, start)):
failure += " Value for key %s was greater than or equal to %s." % (alias, start) failure += " Value '%s' for key %s was greater than or equal to %s." % (value, alias, start)
elif (not invert and self.helper.lt(key, start)): elif (not invert and self.helper.lt(key, start)):
failure += " Value for key %s was less than %s." % (alias, start) failure += " Value '%s' for key %s was less than %s." % (value, alias, start)
else: else:
if (invert and self.helper.gte(key, start) and self.helper.lte(key, end)): if (invert and self.helper.gte(key, start) and self.helper.lte(key, end)):
failure += " Value for key %s was inside the range %s:%s." % (alias, start, end) failure += " Value '%s' for key %s was inside the range %s:%s." % (value, alias, start, end)
elif (not invert and (self.helper.lt(key, start) or self.helper.gt(key, end))): elif (not invert and (self.helper.lt(key, start) or self.helper.gt(key, end))):
failure += " Value for key %s was outside the range %s:%s." % (alias, start, end) failure += " Value '%s' for key %s was outside the range %s:%s." % (value, alias, start, end)
return failure return failure
def checkThresholds(self, threshold_list): def checkThresholds(self, threshold_list):