nagios-charmers team mailing list archive

[Edward Hope-Morley <edward.hope-morley@xxxxxxxxxxxxx>]

Edward Hope-Morley has proposed merging ~hopem/nagios-charm:bug/1844658 into nagios-charm:master.

Commit message:
Make admins contactgroup membership configurable

Requested reviews:
  Canonical IS Reviewers (canonical-is-reviewers)
  Nagios Charm developers (nagios-charmers)

For more details, see:
https://code.launchpad.net/~hopem/nagios-charm/+git/nagios-charm/+merge/376818
-- 
Your team Nagios Charm developers is requested to review the proposed merge of ~hopem/nagios-charm:bug/1844658 into nagios-charm:master.

diff --git a/config.yaml b/config.yaml
index 4ce0f18..ca768ff 100644
--- a/config.yaml
+++ b/config.yaml
@@ -6,6 +6,12 @@ options:
             Any additional nagios configuration you would like to
             add can be set into this element. It will be placed in
             /etc/nagios3/conf.d/extra.cfg
+    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 19e736c..6afea93 100755
--- a/hooks/upgrade-charm
+++ b/hooks/upgrade-charm
@@ -161,8 +161,13 @@ def enable_pagerduty_config():
             os.remove(pagerduty_cron)
 
     # Update contacts for admin
+    contactgroup_members = hookenv.config("contactgroup-members")
+    if enable_pagerduty:
+        contactgroup_members += ", pagerduty" 
+
     template_values = {'enable_pagerduty': enable_pagerduty,
-                       'admin_email': hookenv.config('admin_email')}
+                       'admin_email': hookenv.config('admin_email'),
+                       'contactgroup_members': contactgroup_members}
 
     with open('hooks/templates/contacts-cfg.tmpl', 'r') as f:
         templateDef = f.read()