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

[Xav Paice]

Add config item and support for setting max_check_attempts for ntpmon checks.

Requires https://github.com/juju/charm-helpers/pull/539

[Xav Paice (xavpaice)]

WIP until https://github.com/juju/charm-helpers/pull/539 lands, which is required for this change to work without an error.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Xav Paice (xavpaice)]

cs:~xavpaice/ntp-3 is built with the current master of charmhelpers (including the necessary change).

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 7ad6065347772d705cf47e109985b5d3e1e630e1

diff --git a/config.yaml b/config.yaml
index b676deb..33919f6 100644
--- a/config.yaml
+++ b/config.yaml
@@ -85,3 +85,10 @@ options:
         the appropriate package will be selected based on the operating system.
         Please note that the use of ntp on Ubuntu bionic or later is not recommended as it
         does not receive security updates.
+  max_check_attempts:
+    default: ""
+    type: string
+    description: >
+        The maxiumum number of attempts to check the ntpmon 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 ntpmon check only.
diff --git a/reactive/ntp.py b/reactive/ntp.py
index df2307d..dbc75a6 100755
--- a/reactive/ntp.py
+++ b/reactive/ntp.py
@@ -289,10 +289,12 @@ def update_nrpe_config():
     check_cmd = os.path.join(options['install-dir'], 'check_ntpmon.py') + ' --check ' + ' '.join(nagios_ntpmon_checks)
     unitdata.kv().set('check_cmd', check_cmd)
     nrpe_setup.add_check(
-        check_cmd=check_cmd,
+        shortname='ntpmon',
         description='Check NTPmon {}'.format(current_unit),
-        shortname="ntpmon",
-    )
+        check_cmd=check_cmd,
+        max_check_attempts=hookenv.config('max_check_attempts'),
+        )
+
     nrpe_setup.write()
     set_state('ntp.nrpe.configured')