mirror of
https://github.com/drewkerrigan/nagios-http-json.git
synced 2024-11-22 10:23:50 +01:00
Merge remote-tracking branch 'theicfire/master' into next-release
This commit is contained in:
commit
df2bbdbf51
@ -240,8 +240,9 @@ class JsonRuleProcessor:
|
|||||||
for kv in equality_list:
|
for kv in equality_list:
|
||||||
k, v = kv.split(',')
|
k, v = kv.split(',')
|
||||||
key, alias = _getKeyAlias(k)
|
key, alias = _getKeyAlias(k)
|
||||||
if (self.helper.equals(key, v) is False):
|
if (self.helper.equals(key, v) == False):
|
||||||
failure += " Value for key %s did not match %s." % (alias, v)
|
failure += " Key %s mismatch. %s != %s" % (alias, v,
|
||||||
|
self.helper.get(key))
|
||||||
return failure
|
return failure
|
||||||
|
|
||||||
def checkNonEquality(self, equality_list):
|
def checkNonEquality(self, equality_list):
|
||||||
@ -250,7 +251,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) == True):
|
if (self.helper.equals(key, v) == True):
|
||||||
failure += " Value for key %s matches %s." % (alias, v)
|
failure += " Key %s match found. %s == %s" % (alias, v,
|
||||||
|
self.helper.get(key))
|
||||||
return failure
|
return failure
|
||||||
|
|
||||||
def checkThreshold(self, key, alias, r):
|
def checkThreshold(self, key, alias, r):
|
||||||
|
Loading…
Reference in New Issue
Block a user