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 expansion on newly merged command line args

Browse Source
This commit is contained in:
Ricardo Bartels 2019-05-09 13:18:34 +02:00
parent 18b0898e72
commit 823fc275c9
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
check_http_json.py
View File

@ -206,10 +206,16 @@ class JsonRuleProcessor:
self.key_threshold_critical = self.expandKeys( self.key_threshold_critical = self.expandKeys(
self.rules.key_threshold_critical) self.rules.key_threshold_critical)
self.key_value_list = self.expandKeys(self.rules.key_value_list) self.key_value_list = self.expandKeys(self.rules.key_value_list)
self.key_value_list_not = self.expandKeys(
self.rules.key_value_list_not)
self.key_list = self.expandKeys(self.rules.key_list) self.key_list = self.expandKeys(self.rules.key_list)
self.key_value_list_critical = self.expandKeys( self.key_value_list_critical = self.expandKeys(
self.rules.key_value_list_critical) self.rules.key_value_list_critical)
self.key_value_list_not_critical = self.expandKeys(
self.rules.key_value_list_not_critical)
self.key_list_critical = self.expandKeys(self.rules.key_list_critical) self.key_list_critical = self.expandKeys(self.rules.key_list_critical)
self.key_value_list_unknown = self.expandKeys(
self.rules.key_value_list_unknown)
def expandKeys(self, src): def expandKeys(self, src):
if src is None: if src is None:
@ -302,8 +308,8 @@ class JsonRuleProcessor:
failure += self.checkThresholds(self.key_threshold_warning) failure += self.checkThresholds(self.key_threshold_warning)
if self.key_value_list is not None: if self.key_value_list is not None:
failure += self.checkEquality(self.key_value_list) failure += self.checkEquality(self.key_value_list)
if self.rules.key_value_list_not is not None: if self.key_value_list_not is not None:
failure += self.checkNonEquality(self.rules.key_value_list_not) failure += self.checkNonEquality(self.key_value_list_not)
if self.key_list is not None: if self.key_list is not None:
failure += self.checkExists(self.key_list) failure += self.checkExists(self.key_list)
return failure return failure
@ -314,16 +320,16 @@ class JsonRuleProcessor:
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:
failure += self.checkEquality(self.key_value_list_critical) failure += self.checkEquality(self.key_value_list_critical)
if self.rules.key_value_list_not_critical is not None: if self.key_value_list_not_critical is not None:
failure += self.checkNonEquality(self.rules.key_value_list_not_critical) failure += self.checkNonEquality(self.key_value_list_not_critical)
if self.key_list_critical is not None: if self.key_list_critical is not None:
failure += self.checkExists(self.key_list_critical) failure += self.checkExists(self.key_list_critical)
return failure return failure
def checkUnknown(self): def checkUnknown(self):
unknown = '' unknown = ''
if self.rules.key_value_list_unknown is not None: if self.key_value_list_unknown is not None:
unknown += self.checkEquality(self.rules.key_value_list_unknown) unknown += self.checkEquality(self.key_value_list_unknown)
return unknown return unknown
def checkMetrics(self): def checkMetrics(self):
@ -402,7 +408,7 @@ def parseArgs():
parser.add_argument('-A', '--headers', dest='headers', parser.add_argument('-A', '--headers', dest='headers',
help='The http headers in JSON format.') help='The http headers in JSON format.')
parser.add_argument('-f', '--field_separator', dest='separator', parser.add_argument('-f', '--field_separator', dest='separator',
help='''JSON Field separator, defaults to "." ; help='''JSON Field separator, defaults to ".";
Select element in an array with "(" ")"''') Select element in an array with "(" ")"''')
parser.add_argument('-w', '--warning', dest='key_threshold_warning', parser.add_argument('-w', '--warning', dest='key_threshold_warning',
nargs='*', nargs='*',