Use a contact_group for buildd. This is both shorter, and allows

unsetting the default dsa contact_group.
Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f7534ea..f0f4a1c 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -2286,16 +2286,14 @@ services:
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
     hosts: fano, fasch, field, finzi
-    contacts: luk, pkern, HE
-    contact_groups:
+    contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
-    contacts: luk, pkern, HE
-    contact_groups:
+    contact_groups: buildd
 
  ###
   #-

diff --git a/config/static/conf.d/contacts.cfg b/config/static/conf.d/contacts.cfg
index b46cbe0..36c9cf0 100644 (file)
--- a/config/static/conf.d/contacts.cfg
+++ b/config/static/conf.d/contacts.cfg
@@ -195,3 +195,9 @@ define contactgroup{
         alias                   Debian System Administrators
         members                 weasel, zobel, sgran
         }
+
+define contactgroup{
+        contactgroup_name       buildd
+        alias                   Debian Buildd Admins
+        members                 luk, pkern, HE
+        }