Merge ~xavpaice/charm-graylog:feature/nrpe-max-retries into charm-graylog:master

[Xav Paice]

[Linda Guo (lihuiguo)]

looks good

review: Approve

[Peter Sabaini (peter-sabaini)]

Hey,

in general lgtm, but I believe charmhelpers.contrib.charmsupport.nrpe currently don't set a default (also cf. https://github.com/juju/charm-helpers/issues/564 ).

We'd need to handle defaults either here or in charmhelpers.

Personally I'd lean (explicit is better than implicit) to configure an explicit default=4 and make it type=int for the max_check_attempts in config.yaml but either here or in charmhelpers works

review: Needs Information

[Xav Paice (xavpaice)]

Worth checking the pattern with NTP, what we have done there is the same as here, the Nagios charm itself doesn't set the parameter at all if it's not listed and therefore uses the default in the service definition template.

Note the default is set in Nagios during install, and charmhelpers as been updated to ensure that the relation data does not contain max_check_attempts if it's not set, so that the default for Nagios itself can flow through. If we wanted to tune the default, it should be in the Nagios charm itself.

[Celia Wang (ziyiwang)]

LGTM

review: Approve

diff --git a/src/config.yaml b/src/config.yaml
index 4313e4a..a4469ad 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -139,3 +139,10 @@ options:
     type: string
     description: |
       JVM Heap memory size (default 1G)
+  max_check_attempts:
+    default: ""
+    type: string
+    description: >
+        The maxiumum number of attempts to check the via nrpe a service before switching an
+        alert to HARD status rather than SOFT.  Default for Nagios is 4, if this is set,
+        the default will be overwritten for the Graylog Health check only.
diff --git a/src/reactive/graylog.py b/src/reactive/graylog.py
index 4f4a9ee..dafb826 100644
--- a/src/reactive/graylog.py
+++ b/src/reactive/graylog.py
@@ -1038,14 +1038,15 @@ def configure_nagios(nagios):
             fname = os.path.join(nagios_plugins, os.path.basename(f))
             host.write_file(fname, content.read(), perms=0o755)
     nrpe_setup.add_check(
-        "graylog_health",
-        "Graylog Health check",
-        "{} --uncommitted-warning {} --uncommitted-critical {} {}".format(
+        shortname="graylog_health",
+        description="Graylog Health check",
+        check_cmd="{} --uncommitted-warning {} --uncommitted-critical {} {}".format(
             os.path.join(nagios_plugins, "check_graylog_health.py"),
             conf.get("nagios_uncommitted_warn", 0),
             conf.get("nagios_uncommitted_crit", 100),
             api_url,
         ),
+        max_check_attempts=hookenv.config("max_check_attempts"),
     )
 
     nrpe_setup.write()