X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f7534ea98b7b35ecec5b05a90887924282429480;hb=f98b914893c207ad88c23404f78d546b946d60f9;hp=0e2e4575654ec71391d207da78caa2f68a505e98;hpb=3a319f7c4a0682583a58882142d42409774fd7d2;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0e2e457..f7534ea 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -181,6 +181,10 @@ servers:
     address: 200.17.202.254
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-zivit:
+    address: 80.245.144.3
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -190,45 +194,45 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts, unbound-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
-  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
-  merkel2:
-    address: 192.25.206.71
-    parents: merkel
-    hostgroups: secondary-IPs
+#  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, lenny
+#  merkel2:
+#    address: 192.25.206.71
+#    parents: merkel
+#    hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, unbound-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze
   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
@@ -237,22 +241,22 @@ servers:
   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, squeeze
     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
@@ -261,7 +265,7 @@ servers:
   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
@@ -269,7 +273,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
   geo1:
     address: 82.195.75.105
     parents: unger
@@ -277,19 +281,23 @@ servers:
   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, squeeze
   kaufmann:
     address: 82.195.75.107
     parents: unger
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
+  diamond:
+    address: 82.195.75.108
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, squeeze
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
   byrd:
     address: 82.195.75.92
     parents: unger
@@ -302,7 +310,7 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, unbound-hosts
+    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -312,17 +320,17 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, postgres84-hosts, unbound-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, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, unbound-hosts
+    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
@@ -339,29 +347,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, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
@@ -369,11 +377,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, squeeze
   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
@@ -382,41 +390,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, unbound-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, 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
@@ -426,25 +434,25 @@ 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
@@ -452,25 +460,25 @@ servers:
   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, squeeze
 
   kassia:
     address: 130.89.149.224
@@ -492,23 +500,23 @@ 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, squeeze
     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, squeeze
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
@@ -523,7 +531,7 @@ servers:
   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
@@ -535,35 +543,35 @@ servers:
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze, nfs-server
   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, squeeze, autofs
   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, hasvarfs, 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
+    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, squeeze, autofs
   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, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -583,15 +591,15 @@ 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
@@ -619,7 +627,7 @@ servers:
   quantz:
     address: 206.12.19.122
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
     parents: salieri
@@ -632,20 +640,32 @@ servers:
     address: 206.12.19.125
     parents: luchesi
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
+  glinka:
+    address: 206.12.19.126
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
+  dukas:
+    address: 206.12.19.128
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+  tye:
+    address: 206.12.19.129
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
 
   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
@@ -656,35 +676,35 @@ servers:
   rem:
     address: 82.195.75.68
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hashomefs
+    hostgroups: computers, buildd, hasbootfs, hashomefs, squeeze
 
   zelenka:
     address: 80.245.147.40
-    parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts
+    parents: gw-zivit
+    hostgroups: computers, porterbox, hassrvfs, squeeze
   zandonai:
     address: 80.245.147.46
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs
+    parents: gw-zivit
+    hostgroups: computers, buildd, hassrvfs, squeeze
 
   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, 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, squeeze
   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, autofs
 
 #  lafayette:
 #    address: 147.215.7.160
@@ -694,7 +714,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, squeeze
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -707,15 +727,15 @@ 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, squeeze
   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
@@ -735,7 +755,7 @@ servers:
   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, squeeze
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -749,7 +769,7 @@ servers:
   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, squeeze
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -757,7 +777,7 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs
     # which raid?
   lindberg:
     address: 86.59.118.149
@@ -768,23 +788,23 @@ servers:
   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
@@ -793,11 +813,11 @@ servers:
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
 
   santoro:
     address: 200.17.202.197
@@ -882,7 +902,9 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
-    private: 1
+
+  lenny:
+    alias: Hosts running lenny
 
   kvmdomains:
     alias: Hosts that are KVM domains
@@ -943,9 +965,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
@@ -968,6 +987,9 @@ hostgroups:
   nfs-server:
     alias: hosts serving filesystems using NFS
     private: 1
+  autofs:
+    alias: hosts running the automounter
+    private: 1
 
   highload:
     alias: "hosts on which high load is normal"
@@ -1093,11 +1115,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-  -
-    name: disk usage on /org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-    hosts: merkel
+#  -
+#    name: disk usage on /org
+#    servicegroups: diskspace
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
+#    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -1109,16 +1131,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hosts: ries
-  -
-    name: disk usage on /org/scratch
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
-    hosts: merkel
+#  -
+#    name: disk usage on /org/scratch
+#    servicegroups: diskspace
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
+#    hosts: merkel
   -
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, merkel, tartini, powell, piatti
+    hosts: saens, tartini, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1211,6 +1233,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 ############
  ####
@@ -1416,19 +1453,18 @@ services:
     name: process - ntpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
-    excludehosts: zelenka
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: zelenka, ancina
+    excludehosts: ancina
     excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: zelenka, ancina
+    hosts: ancina
     depends: process - xinetd
 
  ###
@@ -1466,7 +1502,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts, mail-relay
-    excludehosts: master, busoni, merkel, quantz
+    excludehosts: master, busoni, quantz
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
@@ -1476,11 +1512,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, merkel, quantz
+    excludehosts: master, busoni, quantz
   -
     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
+    hosts: master, busoni, quantz
   -
     name: mail queue
     nrpe: "/usr/lib/nagios/plugins/check_mailq -M exim -w 1000 -c 2000"
@@ -1708,6 +1744,12 @@ 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"
+    event_handler: dsa_event_handler_restart_ekey
+    hostgroups: computers
+    excludehostgroups: freebsd
  ###
   -
     name: local resolver
@@ -1757,7 +1799,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd
+    excludehosts: grieg, byrd, abel, alwyn
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1816,6 +1858,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: kassia
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -1828,6 +1871,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:2 --ignore-transfer-speed=1I:1:3 --ignore-transfer-speed=1I:1:4 --ignore-transfer-speed=2I:1:5 --ignore-transfer-speed=2I:1:6"
+    normal_check_interval: 120
+    hosts: kassia
  ###
   -
     name: HW - hpasmcli status
@@ -1886,6 +1935,12 @@ services:
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
     hosts: draghi
+  -
+    name: network service - ldaps cert
+    check: dsa_check_cert!636
+    depends: process - slapd
+    normal_check_interval: 60
+    hosts: draghi
  ###
   -
     name: process - ulogd
@@ -1902,11 +1957,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
@@ -2124,14 +2179,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
@@ -2151,12 +2206,19 @@ services:
  ####
   -
     name: process - stunnel4 - postgres-udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
     hosts: samosa
   -
     name: udd stunnel - master cert
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
     hosts: samosa
+ ####
+ ####
+  -
+    name: process - stunnel4 - puppet-ekeyd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
+    hostgroups: squeeze
+    excludehosts: fano, fasch, field, finzi
  ####
   -
     name: process - krb - kdc
@@ -2225,7 +2287,7 @@ services:
     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:
   -
     name: process - buildd
     servicegroups: buildd
@@ -2233,6 +2295,7 @@ services:
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
     contacts: luk, pkern, HE
+    contact_groups:
 
  ###
   #-
@@ -2274,10 +2337,10 @@ services:
     hostgroups: nfs-server
  # see if the nfs stuff works and doesn't hang.
   # the df check all script will also hang, but we don't appear to pay attention to that
-  -
-    name: nfs mount ftp archive
-    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-    hosts: merkel
+#  -
+#    name: nfs mount ftp archive
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
+#    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
@@ -2287,6 +2350,16 @@ services:
     name: nfs server stabile reachable
     nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
     hosts: quantz
+  #
+  -
+    name: process - automount
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C automount -a '/usr/sbin/automount'"
+    hostgroups: autofs
+  -
+    name: unwanted process - automount
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C automount"
+    hostgroups: computers
+    excludehostgroups: autofs
 
  ############ MISC OTHER Stuff ############
  #####