X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=319d091d07419b03b6acffb9244b1dce9d213dbf;hb=ba3306ecf1949d96c7c314206c355c7eaeeb2dca;hp=b031a21197a49c0f3878bd5b831ce170363792b2;hpb=094257c138222260c0b235e1482ce78fde773f8c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b031a21..319d091 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -77,7 +77,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-sanger:
-    address: 193.62.202.18
+    address: 193.62.202.20
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: tjrc1
@@ -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
@@ -168,6 +168,15 @@ servers:
     address: 86.59.118.145
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-arm:
+    address: 82.44.141.46
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
+  gw-ynic:
+    # really janet, because ynic is stupid about firewalling
+    address: 146.97.42.26
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -177,15 +186,15 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
   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, ulogd-hosts, xinetd-hosts
+    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
@@ -193,21 +202,21 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hasbootfs
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -219,17 +228,17 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts, ulogd-hosts
+    hostgroups: computers, buildd, acpid-hosts
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs, ulogd-hosts
+    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
     contacts: joerg, bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -239,7 +248,7 @@ servers:
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hassrvfs
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -249,7 +258,7 @@ servers:
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, ulogd-hosts, acpid-hosts
+    hostgroups: computers, acpid-hosts, service
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -257,15 +266,15 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts, kvmdomains, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -273,11 +282,19 @@ servers:
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers, ulogd-hosts
-  purcell:
-    address: 82.195.75.69
+    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
+  kokkonen:
+    address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, buildd, ulogd-hosts
+    hostgroups: computers, service, acpid-hosts, postgres84-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
@@ -286,26 +303,31 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, ulogd-hosts
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
 
 
   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, uploadqueue, xinetd-hosts
+    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs
+
+  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
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
-  mayr:
-    address: 140.211.166.58
-    parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs
+#  mayr:
+#    address: 140.211.166.58
+#    parents: gw-osuosl
+#    hostgroups: computers, buildd, hasbootfs
   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
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -317,25 +339,25 @@ servers:
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs
+    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc
 
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
 
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
@@ -343,15 +365,15 @@ servers:
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
-  #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs, ulogd-hosts
+  #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs
 
   klecker:
     address: 194.109.137.218
@@ -361,18 +383,18 @@ servers:
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hassrvfs
     contacts: bzed
 
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service
     contacts: bzed
 
   pergolesi:
@@ -390,52 +412,47 @@ servers:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid
+    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, sparc
     contacts: tjrc1
 
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs, ulogd-hosts
+    hostgroups: computers, buildd, hasvarfs, hashomefs
     contacts: sfrost
 
-  puccini:
-    address: 87.106.4.56
-    parents: gw-1und1
-    hostgroups: computers, buildd, ulogd-hosts, hassrvfs
-    contacts: joerg
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
     contacts: joerg
 
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts, service
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, ulogd-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
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -444,7 +461,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid
 
   pescetti:
     address: 217.114.76.85
@@ -454,7 +471,7 @@ servers:
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, incomingmailrelayed, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -471,18 +488,18 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts
     contacts: luk
 
   agnesi:
     address: 67.233.102.241
     parents: gw-agnesi
-    hostgroups: deadslow
+    hostgroups: deadslow, porterbox
 
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -491,62 +508,62 @@ servers:
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service
   luchesi:
     address: 206.12.19.214
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, ulogd-hosts
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
+    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres84-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts
+    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
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts, service
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -558,48 +575,72 @@ servers:
   fano:
     address: 206.12.19.110
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze
+    hostgroups: computers, freebsd, squeeze, buildd
   finzi:
     address: 206.12.19.111
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze
+    hostgroups: computers, freebsd, squeeze, buildd
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
-    hostgroups: computers
+    hostgroups: computers, porterbox
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
-    hostgroups: computers, buildd, ulogd-hosts
+    hostgroups: computers, buildd
   lucatelli:
     address: 206.12.19.15
     parents: tchaikovsky
-    hostgroups: computers, buildd, ulogd-hosts
+    hostgroups: computers, buildd
+  rossini:
+    address: 206.12.19.19
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts, service
+  salieri:
+    address: 206.12.19.20
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+  traetta:
+    address: 206.12.19.21
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts, service
+  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
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, hasvarfs, hasusrfs
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs, service
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs
+    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, hashomefs, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs, hashomefs
 
   zelenka:
     address: 80.245.147.40
@@ -608,91 +649,91 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs
 
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, ulogd-hosts
+    hostgroups: computers, hasbootfs, ntpsuckers, buildd
 
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service
 
-  lafayette:
-    address: 147.215.7.160
-    parents: gw-esiee
-    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs, ulogd-hosts
+#  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
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, ulogd-hosts, megaraid
+    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
   fasch:
     address: 194.177.211.201
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze
+    hostgroups: computers, freebsd, squeeze, buildd
     #, mptraid
   holter:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, mptraid
+    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service
   barber:
     address: 194.177.211.203
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, buildd
   krenek:
     address: 194.177.211.207
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, buildd
   scelsi:
     address: 194.177.211.208
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, service
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs
   field:
     address: 194.177.211.210
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze
+    hostgroups: computers, freebsd, squeeze, buildd
     #, mptraid
 
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, ulogd-hosts, nfs-server
+    hostgroups: computers, hasbootfs, aacraid, nfs-server, service
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -700,14 +741,47 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, service
     # which raid?
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, service
     # which raid?
 
+  abel:
+    address: 217.140.96.56
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox
+  arnold:
+    address: 217.140.96.57
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  alain:
+    address: 217.140.96.58
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  alwyn:
+    address: 217.140.96.59
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  antheil:
+    address: 217.140.96.60
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
+  arne:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs
+
+  poulenc:
+    address: 144.32.168.77
+    parents: gw-ynic
+    hostgroups: computers, buildd, sw-raid, hassrvfs
+  porpora:
+    address: 144.32.168.78
+    parents: gw-ynic
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
 #############################
 # host groups
@@ -731,6 +805,9 @@ hostgroups:
   freebsd:
     alias: freebsd
     private: 1
+  sparc:
+    alias: sparc
+    private: 1
 
   porterbox:
     alias: developer accessible porter machines
@@ -765,6 +842,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  dl585:
+    alias: HP DL385 hosts
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -778,9 +858,6 @@ hostgroups:
     alias: Hosts with LSI Logic Fusion-MPT
     private: 1
 
-  etch:
-    alias: Hosts running etch
-    private: 1
   squeeze:
     alias: Hosts running squeeze
     private: 1
@@ -837,8 +914,8 @@ hostgroups:
   no-udev:
     alias: hosts not using udev
     private: 1
-  ulogd-hosts:
-    alias: hosts running ulogd
+  no-ulogd:
+    alias: hosts not running ulogd
     private: 1
   acpid-hosts:
     alias: hosts running acpid
@@ -846,6 +923,9 @@ hostgroups:
   uploadqueue:
     alias: hosts that are an anonymous ftp uploadqueue
     private: 1
+  bosserver:
+    alias: hosts running bosserver
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -883,6 +963,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
@@ -954,12 +1037,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries, klecker, kassia, spohr
+    excludehosts: klecker, kassia, spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: ries, klecker, kassia, spohr
+    hosts: klecker, kassia, spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -994,7 +1077,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, puccini, merkel, tartini, powell, piatti
+    hosts: saens, merkel, tartini, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1082,6 +1165,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
     hosts: sibelius
+  -
+    name: disk usage on /srv/fossology.debian.net
+    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 80 90 /vicepa"
+    hostgroups: hasvicepa
 
  ############ All Computers ############
  ####
@@ -1118,12 +1211,53 @@ 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
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: computers
 
+ ####
+  -
+    name: installed firewall
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
+    hostgroups: computers
+    excludehostgroups: freebsd
+  -
+    name: puppetized firewall
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
+    hostgroups: computers
+    excludehostgroups: freebsd
+
  ####
   -
     name: process - samhain
@@ -1232,11 +1366,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
@@ -1278,13 +1412,18 @@ 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
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: heininen
+    hostgroups: computers
  ### MAIL STUFF
  ###
   -
@@ -1566,7 +1705,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"
@@ -1606,24 +1745,42 @@ services:
     name: process - cpqarrayd
     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
+    hostgroups: dl385, dl380, dl360, bl460, dl585
   -
     name: RAID - arrayprobe
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
+    excludehosts: franck
+  -
+    name: RAID - arrayprobe
+    servicegroups: raid
+    nrpe: "sudo /usr/bin/arrayprobe -f /dev/cciss/c1d0"
+    hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+  -
+    name: HW - hpacucli enclosure status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
+    normal_check_interval: 120
+    hosts: franck
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    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 - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: villa, lobos, liszt, senfl, schein, rore
   -
     name: HW - hpasmcli status
@@ -1659,11 +1816,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
     hostgroups: megaraid
  ###
-  -
-    name: RAID - 3ware
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
-    hosts: puccini
+  #-
+  #  name: RAID - 3ware
+  #  servicegroups: raid
+  #  nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
+  #  hosts: puccini
  ###
   -
     name: RAID - MPT
@@ -1680,16 +1837,17 @@ services:
   -
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
-    hostgroups: ulogd-hosts
+    hostgroups: computers
+    excludehostgroups: freebsd, sparc
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
-    hostgroups: computers
-    excludehostgroups: ulogd-hosts
+    hostgroups: freebsd, sparc
+
  ###
   -
     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
   -
@@ -1706,12 +1864,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
@@ -1740,11 +1903,11 @@ services:
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: kassia-sec
-    depends: kassia:process - xinetd
+  #-
+  #  name: network service - rsync
+  #  check: check_tcp!873
+  #  hosts: kassia-sec
+  #  depends: kassia:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
@@ -1779,7 +1942,8 @@ services:
     name: network service - http
     check: check_http
     depends: kassia:process - apache2 - master
-    hosts: kassia-sec, kassia-ftp, kassia-volatile
+    #hosts: kassia-sec, kassia-ftp, kassia-volatile
+    hosts: kassia-ftp, kassia-volatile
 
   # keyserver on kaufmann
   -
@@ -1792,7 +1956,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
+    hosts: franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1806,7 +1970,8 @@ services:
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
     # grieg		buildd.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
+    # vivaldi		fossology.debian.org
+    hosts: franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
     depends: network service - https
     normal_check_interval: 60
 
@@ -1858,7 +2023,8 @@ services:
   -
     name: network service - ftp
     check: check_ftp
-    hosts: kassia-sec, kassia-ftp
+    #hosts: kassia-sec, kassia-ftp
+    hosts: kassia-ftp
     depends: kassia:process - xinetd
 
  ####
@@ -1890,7 +2056,7 @@ services:
  ####
   -
     name: process - postresql84 - 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'"
+    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
@@ -1907,11 +2073,11 @@ services:
   -
     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: ries
+    hosts: franck
   -
     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: ries
+    hosts: franck
  # backups
   -
     name: postgresql backups
@@ -1937,6 +2103,46 @@ 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
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"
+    hosts: franck
+  -
+    name: process - UPS - nut upsd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsd  -a '/sbin/upsd'"
+    hosts: franck
+  -
+    name: process - UPS - nut upsmon master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C upsmon  -a '/sbin/upsmon'"
+    hosts: franck
+  -
+    name: process - UPS - nut upsmon worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C upsmon  -a '/sbin/upsmon'"
+    hosts: franck
+    depends: process - UPS - nut upsmon master
+  -
+    name: UPS - on line power
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
+    hosts: franck
+    depends: process - UPS - nut upsd
 
  ####
   #-
@@ -1959,11 +2165,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
 
  ###
@@ -2038,15 +2252,11 @@ 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
     retry_check_interval: 5
-  -
-    name: DNS SOA sync - security.geo.debian.org
-    check: "dsa_check_soas!security.geo.debian.org"
-    hosts: global
   -
     name: DNS SOA sync - debian.org
     check: "dsa_check_soas_add!draghi.debian.org!debian.org"
@@ -2090,13 +2300,13 @@ services:
   -
     name: DNS SEC - signature expiry
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d /var/cache/bind/git/domains"
-    runfrom: draghi
+    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: orff
   -
     name: DNS SEC - delegations
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /var/cache/bind/git/domains check-header"
-    runfrom: draghi
+    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: orff
 
  ############
   -
@@ -2114,6 +2324,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