X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=3efce8972f2994c4ba93860eb97d03d44fa25629;hb=77ffcd921f2323f62642e253b5e3aef8bb38fc0a;hp=5189cb1033c70dc93148105fb8fb662f684a61b9;hpb=3ae9b6c218cf8ba1bb9a32676079354d368e69b6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5189cb1..3efce89 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -80,9 +80,9 @@ servers:
     address: 193.62.202.20
     parents: gw-ubc
     hostgroups: routing-infrastructure
-    contacts: tjrc1
+    contacts: tjrc1, dave
   gw-frost:
-    address: 130.81.242.195
+    address: 130.81.27.83
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-1und1:
@@ -152,10 +152,10 @@ servers:
     address: 130.239.18.97
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-esiee:
-    address: 195.220.83.13
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+#  gw-esiee:
+#    address: 195.220.83.13
+#    parents: gw-ubc
+#    hostgroups: routing-infrastructure
   gw-ghent:
     address: 193.191.17.50
     parents: gw-ubc
@@ -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,11 +190,11 @@ 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
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts, unbound-hosts
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   merkel:
     address: 192.25.206.16
     parents: gw-HP-ftc
@@ -202,7 +206,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, unbound-hosts
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -228,13 +232,8 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts
+    hostgroups: computers, buildd, acpid-hosts, squeeze
 
-  bartok:
-    address: 82.195.75.91
-    parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
-    contacts: joerg, bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -253,60 +252,72 @@ servers:
   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
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https
     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
   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
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts
   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
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https
   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, no-udev, hasbootfs, ntpsuckers
+    hostgroups: computers, buildd, hasbootfs
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, postgres84-hosts
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts
+  byrd:
+    address: 82.195.75.92
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  lamb:
+    address: 82.195.75.101
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
 
   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
   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, unbound-hosts, squeeze
 
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, postgres84-hosts, unbound-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
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, unbound-hosts
 
   mayer:
     address: 140.211.166.78
@@ -319,7 +330,8 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze
+    #, bosserver
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -349,7 +361,7 @@ servers:
   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
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
@@ -370,7 +382,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts
 
   saens:
     address: 128.101.240.212
@@ -386,7 +398,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https
     contacts: bzed
 
   pergolesi:
@@ -399,23 +411,23 @@ servers:
     parents: gw-sanger
     # SMP kernel doesn't run stable
     hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
-    contacts: tjrc1
+    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
-    contacts: tjrc1
+    contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service
-    contacts: tjrc1
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
+    contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
     hostgroups: computers, porterbox, sw-raid, sparc
-    contacts: tjrc1
+    contacts: tjrc1, dave
 
   voltaire:
     address: 72.66.115.54
@@ -426,7 +438,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts
     contacts: joerg
 
   schumann:
@@ -436,11 +448,11 @@ servers:
   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
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres84-hosts, apache-https
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -448,7 +460,7 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts
 
   caballero:
     address: 193.201.200.200
@@ -463,7 +475,7 @@ servers:
   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
@@ -500,30 +512,30 @@ servers:
   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
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts
   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
@@ -531,7 +543,7 @@ servers:
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
@@ -539,23 +551,19 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service
-  cimarosa:
-    address: 206.12.19.8
-    parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts, service
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -587,15 +595,43 @@ servers:
   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
-    hostgroups: computers, dl585, acpid-hosts, service
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   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
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  locke:
+    address: 206.12.19.120
+    parents: tchaikovsky
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
+  lotti:
+    address: 206.12.19.121
+    parents: tchaikovsky
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  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
+  nono:
+    address: 206.12.19.123
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
+  reger:
+    address: 206.12.19.124
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
+  danzi:
+    address: 206.12.19.125
+    parents: luchesi
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -614,12 +650,12 @@ servers:
   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
+    address: 82.195.75.68
+    parents: gw-man-da
     hostgroups: computers, buildd, hasbootfs, hashomefs
 
   zelenka:
@@ -639,7 +675,7 @@ servers:
   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
 
   praetorius:
     address: 130.239.18.121
@@ -648,21 +684,21 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts
 
-  lafayette:
-    address: 147.215.7.160
-    parents: gw-esiee
-    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+#  lafayette:
+#    address: 147.215.7.160
+#    parents: gw-esiee
+#    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
 
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service
+    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
   fasch:
     address: 194.177.211.201
     parents: rautavaara
@@ -683,7 +719,7 @@ servers:
   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
@@ -695,11 +731,11 @@ servers:
   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
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -709,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
+    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
@@ -721,12 +757,12 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
     # which raid?
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
     # which raid?
 
   abel:
@@ -752,7 +788,7 @@ servers:
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, squeeze
 
   poulenc:
     address: 144.32.168.77
@@ -763,6 +799,12 @@ servers:
     parents: gw-ynic
     hostgroups: computers, buildd, sw-raid, hassrvfs
 
+  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
 #
@@ -852,6 +894,9 @@ hostgroups:
   heavy-exim:
     alias: "hosts running the full mail stuff, including clamav and postgrey"
     private: 1
+  mail-relay:
+    alias: "relays usually are hosts with more exim processes"
+    private: 1
   spamd:
     alias: "hosts running spamassassin as daemon"
     private: 1
@@ -864,6 +909,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
@@ -888,6 +937,9 @@ hostgroups:
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
+  postgres90-hosts:
+    alias: hosts running postgres90
+    private: 1
   mysql-hosts:
     alias: hosts running mysql
     private: 1
@@ -903,6 +955,12 @@ hostgroups:
   uploadqueue:
     alias: hosts that are an anonymous ftp uploadqueue
     private: 1
+  bosserver:
+    alias: hosts running bosserver
+    private: 1
+  apache-https:
+    alias: hosts with https services
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -940,6 +998,9 @@ hostgroups:
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
+  hasvicepa:
+    alias: hosts with a /vicepa
+    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1011,12 +1072,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries, klecker, kassia, spohr
+    excludehosts: klecker, kassia, spohr, liszt
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: ries, klecker, kassia, spohr
+    hosts: klecker, kassia, spohr, liszt
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1036,12 +1097,18 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-    hosts: merkel, bartok
+    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
+    excludehosts: ries
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
+    hosts: ries
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -1082,27 +1149,22 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni
+    hosts: busoni, wieck, heininen
 
   -
     name: disk usage on /srv/morgue.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
     hosts: stabile
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
     hosts: stabile, beethoven, sibelius
-  -
-    name: disk usage on /srv/ftp-master.debian.org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org"
-    hosts: stabile
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: stabile,sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-01
@@ -1144,6 +1206,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
     hosts: vivaldi
+  -
+    name: disk usage on /vicepa
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
+    hostgroups: hasvicepa
 
  ############ All Computers ############
  ####
@@ -1152,7 +1219,6 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    excludehostgroups: squeeze
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1166,7 +1232,7 @@ services:
   -
     name: backup server config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: bartok, beethoven
+    hosts: beethoven
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1180,6 +1246,35 @@ services:
     normal_check_interval: 60
     retry_check_interval: 5
 
+ ####
+  - name: afs - space
+    hostgroups: bosserver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
+
+  - name: afs - bos
+    hostgroups: bosserver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
+
+  - name: afs - waiting connections
+    hostgroups: bosserver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
+
+  #- name: afs - udebug
+  #  hostgroups: bosserver
+  #  nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-udebug -H localhost"
+  #  normal_check_interval: 60
+  #  max_check_attempts: 2
+  #  retry_check_interval: 5
+
  ####
   -
     name: puppet
@@ -1306,11 +1401,11 @@ services:
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
-    excludehostgroups: squeeze
+    excludehostgroups: freebsd
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
-    hostgroups: squeeze
+    hostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1352,12 +1447,12 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
-    excludehostgroups: squeeze
+    excludehostgroups: freebsd
 
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: squeeze
+    hostgroups: freebsd
 
   -
     name: remote logging
@@ -1370,18 +1465,26 @@ services:
     name: process - exim
     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
-    excludehosts: master, busoni, merkel
+    excludehostgroups: postfix-hosts, mail-relay
+    excludehosts: master, busoni, merkel, 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'"
+    hostgroups: mail-relay
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, busoni, merkel
+    excludehosts: master, busoni, merkel, 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
+    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
@@ -1596,7 +1699,6 @@ services:
     depends: process - postfix - master
     normal_check_interval: 120
 
-
   -
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
@@ -1606,6 +1708,16 @@ services:
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
     hostgroups: computers
+ ###
+  -
+    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
  ###
   -
     name: process - uptimed
@@ -1645,7 +1757,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg
+    excludehosts: grieg, byrd
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1686,6 +1798,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
     hostgroups: dl385, dl380, dl360, bl460, dl585
+    excludehostgroups: squeeze
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1706,7 +1819,7 @@ services:
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
     normal_check_interval: 120
     hosts: franck
   -
@@ -1787,7 +1900,7 @@ services:
  ###
   -
     name: process - udevd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a '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
   -
@@ -1804,12 +1917,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
     hostgroups: computers
     excludehostgroups: acpid-hosts, kvmdomains
+ ###
+  -
+    name: process - bosserver
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
+    hostgroups: bosserver
 
  ###
   -
     name: process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg
+    hosts: grieg, byrd
  ###
   -
     name: process - xinetd
@@ -1866,6 +1984,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+  -
+    name: unwanted process - apache2
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
+    hostgroups: computers
+    excludehostgroups: apache2-hosts
 
   -
     name: network service - http
@@ -1891,37 +2014,24 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
+    hostgroups: apache-https
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    # ries		ftp-master.debian.org
-    # chopin		security-master.debian.org
-    # spohr		rt.debian.org
-    # tchaikovsky	nagios.debian.org
-    # draghi		db.debian.org
-    # merkel2		nm.debian.org
-    # liszt		lists.debian.org
-    # grieg		buildd.debian.org
-    # vivaldi		fossology.debian.org
-    hosts: ries, franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
+    hostgroups: apache-https
     depends: network service - https
     normal_check_interval: 60
-
-  # merkel
-  -
-    name: network service - https
-    check: check_https
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
-    normal_check_interval: 120
   -
-    name: network service - http
-    check: check_http
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
+    name: unwanted network service - https
+    check: dsa_check_port_closed!443
+    hostgroups: apache2-hosts
+    excludehostgroups: apache-https
+    # ravel does ssh on port 443
+    excludehosts: ravel
+    normal_check_interval: 60
+
  ####
   -
     name: process - named
@@ -1989,26 +2099,35 @@ services:
   #  hostgroups: postgres81-hosts
   #  depends: process - postresql81 - master
  ####
+  -
+    name: unwanted process - postresql
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
+    hostgroups: computers
+    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres83-hosts
+  -
+    name: process - postresql90 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.0/bin/postgres'"
+    hostgroups: postgres90-hosts
   -
     name: process - postresql84 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
   -
     name: process - postresql83 - 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/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres'"
     hostgroups: postgres83-hosts
   #-
   #  name: process - postresql83 - master udd
   #  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/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
   #  hosts: piatti
-  -
-    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: klecker, chopin
+  #-
+  #  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
+    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'"
@@ -2038,6 +2157,23 @@ services:
     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 - krb - kdc
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kdc -a '/usr/lib/heimdal-servers/kdc --config-file=/etc/heimdal-kdc/kdc.conf'"
+    hosts: schuetz, byrd
+  -
+    name: process - krb - iprop - slave
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-slave -a '/usr/sbin/ipropd-slave byrd.debian.org'"
+    hosts: schuetz
+  -
+    name: process - krb - iprop - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-master -a '/usr/sbin/ipropd-master'"
+    hosts: byrd
+  -
+    name: process - krb - kpasswdd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kpasswdd -a '/usr/lib/heimdal-servers/kpasswdd'"
+    hosts: byrd
  ###
   -
     name: process - UPS - nut usbhid-ups - ups1
@@ -2083,11 +2219,19 @@ services:
     hosts: unger
 
  ###
+  -
+    name: process - buildd
+    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
+
   -
     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
 
  ###
@@ -2139,6 +2283,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
     hosts: bellini
 
+  -
+    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
+
  ############ MISC OTHER Stuff ############
  #####
   -
@@ -2162,7 +2311,7 @@ services:
     retry_check_interval: 5
   -
     name: mirror sync - snapshot
-    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!1800:28800"
+    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
     hosts: global
     normal_check_interval: 15
     max_check_attempts: 5
@@ -2211,12 +2360,12 @@ services:
     name: DNS SEC - signature expiry
     hosts: global
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d --geozonedir /srv/dns.debian.org/geo/zones /srv/dns.debian.org/var/gitdns/domains"
-    runfrom: draghi
+    runfrom: orff
   -
     name: DNS SEC - delegations
     hosts: global
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /srv/dns.debian.org/var/gitdns/domains --dir /srv/dns.debian.org/geo/zones check-header"
-    runfrom: draghi
+    runfrom: orff
 
  ############
   -
@@ -2234,6 +2383,6 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=789 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=952 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini