Merge ~hloeung/mailman3-core-charm:master into mailman3-core-charm:master

[Haw Loeung]

Fix code to set up NRPE checks.

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

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

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

Change successfully merged at revision 4cdf4d03108d83a546f5c9289d59e5faf3f3c55b

diff --git a/config.yaml b/config.yaml
index 9a493a2..e5db6d3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -3,3 +3,19 @@ options:
     type: string
     default: ""
     description: "Additional packages to install on the unit."
+  nagios_context:
+    default: "juju"
+    type: string
+    description: |
+      Used by the nrpe subordinate charms.
+      A string that will be prepended to instance name to set the host name
+      in nagios. So for instance the hostname would be something like:
+          juju-myservice-0
+      If you're running multiple environments with the same services in them
+      this allows you to differentiate between them.
+  nagios_servicegroups:
+    default: ""
+    type: string
+    description: |
+      A comma-separated list of nagios servicegroups.
+      If left empty, the nagios_context will be used as the servicegroup
diff --git a/layer.yaml b/layer.yaml
index 8c96637..52b8b6f 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,7 +1,6 @@
 repo: lp:mailman3-core-charm
 includes:
   - 'interface:generic-ip-port-user-pass'
-  - 'interface:nrpe-external-master'
   - 'interface:pgsql'
   - 'layer:apt'
   - 'layer:basic'
diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 7b7b3a4..45a07f0 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -5,6 +5,7 @@ from charms.reactive import clear_flag, endpoint_from_flag, set_flag, when, when
 from charmhelpers.core import hookenv, unitdata
 from charmhelpers.core.host import service
 from charmhelpers.core.templating import render
+from charmhelpers.contrib.charmsupport import nrpe
 
 
 # We actually have two configs for this, though realistically the hyperkitty
@@ -152,28 +153,28 @@ def changed_archiver_data():
 
 @when('nrpe-external-master.available')
 def setup_nagios(nagios):
-    config = hookenv.config()
+    if hookenv.hook_name() == 'update-status':
+        return
+
+    # Ask charmhelpers.contrib.charmsupport's nrpe to work out our hostname
+    hostname = nrpe.get_nagios_hostname()
+    nrpe_setup = nrpe.NRPE(hostname=hostname, primary=False)
+
     db = unitdata.kv()
-    unit_name = hookenv.local_unit()
+
     check_base = '/usr/lib/nagios/plugins/'
     process_check = check_base + 'check_procs'
 
     mailman_master_process = [process_check, '-c', '1:1', '-C', 'python3', '-a', 'master']
-    nagios.add_check(mailman_master_process, name="mailman_master_process",
-                     description="Check for Mailman3 master process",
-                     context=config['nagios_context'], unit=unit_name)
+    nrpe_setup.add_check('mailman_master_process', 'Check for Mailman3 master process', mailman_master_process)
 
     mailman_runner_process = [process_check, '-c', '12:12', '-C', 'python3', '-a', 'runner']
-    nagios.add_check(mailman_runner_process, name="mailman_runner_process",
-                     description="Check for Mailman3 runner processes",
-                     context=config['nagios_context'], unit=unit_name)
+    nrpe_setup.add_check('mailman_runner_process', 'Check for Mailman3 runner processes', mailman_runner_process)
 
     mailman_rest_port = [check_base + 'check_tcp', '-H', '127.0.0.1', '-p', db.get('admin_port')]
-    nagios.add_check(mailman_rest_port, name="mailman_rest_port",
-                     description="Check Mailman3 REST API port",
-                     context=config['nagios_context'], unit=unit_name)
+    nrpe_setup.add_check('mailman_rest_port', 'Check Mailman3 REST API port', mailman_rest_port)
 
     postfix_check = [check_base + 'check_tcp', '-H', '127.0.0.1', '-p', '25']
-    nagios.add_check(postfix_check, name="postfix_port",
-                     description="Check postfix port",
-                     context=config['nagios_context'], unit=unit_name)
+    nrpe_setup.add_check('postfix_port', 'Check postfix port', postfix_check)
+
+    nrpe_setup.write()