7 Commits
v2.1 ... v2.1.1

Author SHA1 Message Date
Markus Opolka
e3ac06864d Merge pull request #68 from ccin2p3/feature/load_default_ca_certs
[TLS] Always load system default C.A files
2021-01-22 10:39:33 +01:00
Rémi Ferrand
63542f3226 If TLS is enabled, context now loads the system default C.A files
* This allows system wide deployed C.A to be used without any further
  configuration.
2021-01-21 12:02:41 +01:00
Markus Opolka
cdb2474ee0 Update README 2020-11-24 20:27:40 +01:00
Markus Opolka
2821a1ae66 Merge pull request #66 from drewkerrigan/array-bug
Fix conditional check on empty data.
2020-09-14 10:36:14 +02:00
Markus Opolka
831bfdf97b Merge pull request #65 from alesc/patch-1
Update icinga2_check_command_definition.conf
2020-09-12 08:21:01 +02:00
alesc
f612277772 Update icinga2_check_command_definition.conf
small error in icinga2 conf definition, --key_metricS does not exist --key_metric does.
2020-09-11 10:18:02 +02:00
Markus Opolka
1f440e0ff5 Fix conditional check on empty data.
Fixes issue #64
2020-07-15 08:07:16 +02:00
3 changed files with 5 additions and 4 deletions

View File

@@ -210,7 +210,7 @@ More info about Nagios Range format and Units of Measure can be found at [https:
### Requirements
* Python 3
* Python 3.6+
### Configuration

View File

@@ -152,7 +152,7 @@ class JsonHelper:
(Element.Key.NestedKey). Returns (None, 'not_found') if not found
"""
if temp_data:
if temp_data != '':
data = temp_data
else:
data = self.data
@@ -550,6 +550,7 @@ def main(cliargs):
context.verify_mode = ssl.CERT_NONE
else:
context.verify_mode = ssl.CERT_OPTIONAL
context.load_default_certs()
if args.cacert:
try:
context.load_verify_locations(args.cacert)

View File

@@ -97,8 +97,8 @@ object CheckCommand "http_json" {
value = "$http_json_key_not_equals_critical$"
description = "Checks equality of these keys and values (key[>alias],value key2,value2) to determine status. Multiple key values can be delimited with colon (key,value1:value2). Return critical if equality check succeeds."
}
"--key_metrics" = {
value = "$http_json_key_metrics$"
"--key_metric" = {
value = "$http_json_key_metric$"
description = "Gathers the values of these keys"
}
}