Merge ~hopem/charm-nagios:bug/1844658 into ~nagios-charmers/charm-nagios:master

[Edward Hope-Morley]

Make admins contactgroup membership configurable

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

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

[Joel Sing (jsing)]

Change looks fine, but see comment inline. You'll also likely need to rebase this change.

[Edward Hope-Morley (hopem)]

responded inline, will fixup

[Edward Hope-Morley (hopem)]

patch updated

[James Hebden (ec0)]

LGTM

review: Approve

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision 282cb0948760c2309705fab734fca951d79ad0a1

diff --git a/config.yaml b/config.yaml
index da83582..4fb975c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -11,6 +11,12 @@ options:
         default: true
         description: |
             Enable flap detection on monitored hosts and services.
+    contactgroup-members:
+        type: string
+        default: "root"
+        description: |
+            Comma separated list of contacts to add as members of the admins
+            group.
     ssl:
         type: string
         default: "off"
diff --git a/hooks/templates/contacts-cfg.tmpl b/hooks/templates/contacts-cfg.tmpl
index 24a1372..34cf6ff 100644
--- a/hooks/templates/contacts-cfg.tmpl
+++ b/hooks/templates/contacts-cfg.tmpl
@@ -46,6 +46,6 @@ define contact{
 define contactgroup{
         contactgroup_name       admins
         alias                   Nagios Administrators
-        members                 root{% if enable_pagerduty -%}, pagerduty{% endif %}
+        members                 {{ contactgroup_members }}
         }
 
diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
index 9edf436..1016391 100755
--- a/hooks/upgrade-charm
+++ b/hooks/upgrade-charm
@@ -121,8 +121,7 @@ def enable_pagerduty_config():
         proxy_switch = '--proxy {}'.format(proxy) if proxy else ''
 
         # Ship the pagerduty_nagios.cfg file
-        template_values = {'enable_pagerduty': enable_pagerduty,
-                           'pagerduty_key': pagerduty_key,
+        template_values = {'pagerduty_key': pagerduty_key,
                            'pagerduty_path': pagerduty_path,
                            'proxy_switch': proxy_switch,
                            'notification_levels': notification_levels}
@@ -161,8 +160,14 @@ def enable_pagerduty_config():
             os.remove(pagerduty_cron)
 
     # Update contacts for admin
-    template_values = {'enable_pagerduty': enable_pagerduty,
-                       'admin_email': hookenv.config('admin_email')}
+    contactgroup_members = hookenv.config("contactgroup-members")
+    if enable_pagerduty:
+        # avoid duplicates
+        if "pagerduty" not in contactgroup_members:
+            contactgroup_members += ", pagerduty" 
+
+    template_values = {'admin_email': hookenv.config('admin_email'),
+                       'contactgroup_members': contactgroup_members}
 
     with open('hooks/templates/contacts-cfg.tmpl', 'r') as f:
         templateDef = f.read()