X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fstatic%2Fobjects%2Fcontacts.cfg;h=e204d5e405ebcb3d06ad343471c19abb0c997128;hb=a77068307998272a55e518046789f80ee3881270;hp=a03f3728d7cdca5c486edb9c09ed9c84b0743523;hpb=37ef443ae3f938a12eae7f43437b803f119ecd5d;p=mirror%2Fdsa-nagios.git

diff --git a/config/static/objects/contacts.cfg b/config/static/objects/contacts.cfg
index a03f372..e204d5e 100644
--- a/config/static/objects/contacts.cfg
+++ b/config/static/objects/contacts.cfg
@@ -5,8 +5,8 @@
 define contact{
 	contact_name                    weasel
 	alias                           Peter Palfrader
-	service_notification_period     24x7
-	host_notification_period        24x7
+	service_notification_period     never
+	host_notification_period        never
 	service_notification_options    w,u,c,r
 	host_notification_options       d,r
 	service_notification_commands   notify-service-by-email
@@ -135,7 +135,7 @@ define contact{
 	}
 define contact{
 	contact_name                    pkern
-	alias                           Philip Kern
+	alias                           Philipp Kern
 	service_notification_period     24x7
 	host_notification_period        24x7
 	service_notification_options    w,u,c,r
@@ -155,17 +155,6 @@ define contact{
 	host_notification_commands      notify-host-by-email
 	email                           he@debian.org
 	}
-define contact{
-	contact_name                    sgran
-	alias                           Stephen Gran
-	service_notification_period     never
-	host_notification_period        never
-	service_notification_options    n
-	host_notification_options       n
-	service_notification_commands   notify-service-by-email
-	host_notification_commands      notify-host-by-email
-	email                           steve@lobefin.net
-	}
 define contact{
 	contact_name                    faw
 	alias                           Felipe Augusto van de Wiel
@@ -212,7 +201,7 @@ define contact{
 	}
 define contact{
 	contact_name                    buildd-nsa
-	alias                           IRC bot for alioth notifications
+	alias                           IRC bot for buildd notifications
 	service_notification_period     24x7
 	host_notification_period        24x7
 	service_notification_options    w,u,c,r
@@ -221,6 +210,18 @@ define contact{
 	host_notification_commands      notify-host-by-email
 	email                           buildd-nagios@commit.noreply.org
 	}
+define contact{
+	contact_name                    dsa-nsa
+	alias                           IRC bot for DSA notifications
+	service_notification_period     24x7
+	host_notification_period        24x7
+	service_notification_options    w,u,c,r
+	host_notification_options       d,r
+	service_notification_commands   notify-irc-service
+	host_notification_commands      notify-irc-host
+	address1			dsa
+	email                           debian-nagios@commit.noreply.org
+	}
 define contact{
 	contact_name                    christoph
 	alias                           Christoph Egger
@@ -232,6 +233,50 @@ define contact{
 	host_notification_commands      notify-host-by-email
 	email                           christoph@debian.org
 	}
+define contact{
+	contact_name                    zumbi
+	alias                           Hector Oron
+	service_notification_period     24x7
+	host_notification_period        24x7
+	service_notification_options    w,u,c,r
+	host_notification_options       d,r
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           zumbi@oron.es
+	}
+define contact{
+	contact_name                    jcristau
+	alias                           Julien Cristau
+	service_notification_period     never
+	host_notification_period        never
+	service_notification_options    n
+	host_notification_options       n
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           jcristau@debian.org
+	}
+define contact{
+	contact_name                    pabs
+	alias                           Paul Wise
+	service_notification_period     never
+	host_notification_period        never
+	service_notification_options    n
+	host_notification_options       n
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           pabs@debian.org
+	}
+define contact{
+	contact_name                    aurel32
+	alias                           Aurelien Jarno
+	service_notification_period     never
+	host_notification_period        never
+	service_notification_options    n
+	host_notification_options       n
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           aurel32@debian.org
+	}
 
 
 ###############################################################################
@@ -245,16 +290,23 @@ define contact{
 # We only have one contact in this simple configuration file, so there is
 # no need to create more than one contact group.
 
+define contactgroup{
+        contactgroup_name       dsa-notifier
+        alias                   Debian System Administrators (including bots)
+        members                 dsa-nsa
+        contactgroup_members    dsa
+        }
+
 define contactgroup{
         contactgroup_name       dsa
         alias                   Debian System Administrators
-        members                 weasel, zobel, sgran, paravoid, tfheen, lfilipoz
+        members                 weasel, zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32
         }
 
 define contactgroup{
         contactgroup_name       buildd
         alias                   Debian Buildd Admins
-        members                 luk, pkern, HE, buildd-nsa
+        members                 buildd-nsa
         }
 
 define contactgroup{
@@ -266,5 +318,5 @@ define contactgroup{
 define contactgroup{
         contactgroup_name       alioth-admins
         alias                   Debian Alioth admins
-        members                 sgran, tfheen, alioth-nsa
+        members                 alioth-nsa
         }