X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=095efa13a127aea66ea8fce90aee4425573df948;hb=4fecb08579506430d660f0760a3b2d24d0271c40;hp=5a5a616e6889a3dd410de68130ca402fc7d7cb28;hpb=6d841c284c7356ee7870424c629e3658aaf0bec9;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5a5a616..095efa1 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -177,6 +177,10 @@ servers:
     address: 146.97.42.26
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-c3sl:
+    address: 200.17.202.254
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -186,7 +190,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts, apache2-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts, squeeze
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
@@ -194,7 +198,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: gw-HP-ftc
-    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts, lenny
   merkel2:
     address: 192.25.206.71
     parents: merkel
@@ -202,90 +206,90 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, squeeze
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, unbound-hosts
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, lenny
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasbootfs, hashomefs
+    hostgroups: computers, porterbox, hasbootfs, hashomefs, lenny
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasusrfs
+    hostgroups: computers, porterbox, hasusrfs, lenny
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts
+    hostgroups: computers, buildd, acpid-hosts, squeeze
 
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, lenny
     contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, hassrvfs, lenny
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
     contacts: bzed
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https, lenny
     contacts: bzed
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, squeeze
   nielsen:
     address: 82.195.75.99
     parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, apache2-hosts
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, lenny
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, acpid-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, squeeze
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, lenny
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, lenny
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, lenny
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -298,27 +302,27 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid
+    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, unbound-hosts, lenny
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
 
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, postgres84-hosts
+    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
 
   franck:
     address: 128.148.34.3
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres90-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, lenny
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -326,7 +330,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -335,29 +339,29 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc
+    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
 
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
   gluck:
     address: 150.203.164.38
     parents: gw-anu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
 
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, lenny
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
@@ -365,11 +369,11 @@ servers:
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, lenny
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts, squeeze
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
@@ -378,41 +382,41 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts, lenny
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
     contacts: bzed
 
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, bind9-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, unbound-hosts, squeeze
     contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs
+    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers, lenny
     contacts: tjrc1, dave
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, lenny
     contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
@@ -422,56 +426,56 @@ servers:
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, sparc
+    hostgroups: computers, porterbox, sw-raid, sparc, squeeze
     contacts: tjrc1, dave
 
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs
+    hostgroups: computers, buildd, hasvarfs, hashomefs, lenny
     contacts: sfrost
 
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, lenny
     contacts: joerg
 
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, squeeze
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres84-hosts, apache-https
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres90-hosts, squeeze
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, lenny
 
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, smart, hasorgfs
+    hostgroups: computers, porterbox, smart, hasorgfs, lenny
 
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -488,78 +492,78 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, lenny
     contacts: luk
 
   agnesi:
     address: 67.233.102.241
     parents: gw-agnesi
-    hostgroups: deadslow, porterbox
+    hostgroups: deadslow, porterbox, lenny
 
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, lenny
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
     parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, lenny
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts, service
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts, service
+    hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, lenny
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, squeeze
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service
+    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service
+    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service, lenny
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, lenny
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres84-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service
+    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, ftpd-hosts
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, lenny
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -579,19 +583,19 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, lenny
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, lenny
   lucatelli:
     address: 206.12.19.15
     parents: tchaikovsky
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, lenny
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
@@ -599,7 +603,7 @@ servers:
   traetta:
     address: 206.12.19.21
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   schuetz:
     address: 206.12.19.119
     parents: tchaikovsky
@@ -632,55 +636,55 @@ servers:
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, lenny
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, lenny
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs, service
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs, service, lenny
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service
+    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
     contacts: holger
 
   rem:
-    address: 195.71.99.217
-    parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, hashomefs
+    address: 82.195.75.68
+    parents: gw-man-da
+    hostgroups: computers, buildd, hasbootfs, hashomefs, squeeze
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts
+    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts, lenny
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, lenny
 
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, buildd
+    hostgroups: computers, hasbootfs, ntpsuckers, buildd, lenny
 
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, lenny
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze
 
 #  lafayette:
 #    address: 147.215.7.160
@@ -690,7 +694,7 @@ servers:
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, lenny
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -703,35 +707,35 @@ servers:
   holter:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service
+    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service, lenny
   barber:
     address: 194.177.211.203
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service
+    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd
+    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
   krenek:
     address: 194.177.211.207
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd
+    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
   scelsi:
     address: 194.177.211.208
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, service
+    hostgroups: computers, acpid-hosts, mptraid, service, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts, lenny
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -741,11 +745,11 @@ servers:
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service
+    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -753,47 +757,53 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
     # which raid?
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
     # which raid?
 
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, lenny
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, squeeze
 
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+
+  santoro:
+    address: 200.17.202.197
+    parents: gw-c3sl
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+    contacts: faw
 
 #############################
 # host groups
@@ -872,7 +882,9 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
-    private: 1
+
+  lenny:
+    alias: Hosts running lenny
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -899,6 +911,10 @@ hostgroups:
   bind9-hosts:
     alias: hosts running bind9
     private: 1
+  # once every host runs unbound, do away with this group and check "computers" instead
+  unbound-hosts:
+    alias: hosts running unbound
+    private: 1
   amavis-hosts:
     alias: hosts running amavis
     private: 1
@@ -929,9 +945,6 @@ hostgroups:
   mysql-hosts:
     alias: hosts running mysql
     private: 1
-  no-udev:
-    alias: hosts not using udev
-    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1197,6 +1210,21 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
     hostgroups: hasvicepa
+  -
+    name: disk usage on /var/lib/postgresql/9.0/dak
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
+    hosts: franck
+  -
+    name: disk usage on /srv/ftp-master.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
+    hosts: franck
+  -
+    name: disk usage on /srv/pgbackup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
+    hosts: franck
 
  ############ All Computers ############
  ####
@@ -1467,6 +1495,10 @@ services:
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
     hosts: master, busoni, merkel, quantz
+  -
+    name: mail queue
+    nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
+    hostgroups: heavy-exim
  ###
   -
     name: process - clamav - clamd
@@ -1681,7 +1713,6 @@ services:
     depends: process - postfix - master
     normal_check_interval: 120
 
-
   -
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
@@ -1691,6 +1722,21 @@ services:
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
     hostgroups: computers
+  -
+    name: system - available entropy
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
+    hostgroups: computers
+    excludehostgroups: freebsd
+ ###
+  -
+    name: local resolver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
+    hostgroups: computers
+    normal_check_interval: 60
+  -
+    name: process - unbound
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
+    hostgroups: unbound-hosts, squeeze
  ###
   -
     name: process - uptimed
@@ -1875,11 +1921,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: no-udev, freebsd
+    excludehostgroups: freebsd
   -
     name: unexpected process - udev
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
-    hostgroups: no-udev, freebsd
+    hostgroups: freebsd
  ###
   -
     name: process - acpid
@@ -2097,14 +2143,14 @@ services:
   #  name: process - postresql83 - dak master
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
   #  hosts: chopin
-  -
-    name: process - postresql84 - dak master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-    hosts: franck, chopin
-  -
-    name: process - postresql84 - dak-dev master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
-    hosts: franck
+  #-
+  #  name: process - postresql84 - dak master
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
+  #  hosts: franck, chopin
+  #-
+  #  name: process - postresql84 - dak-dev master
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
+  #  hosts: franck
  # backups
   -
     name: postgresql backups