X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=28063d4463213e9f114a22282d9938d89898643b;hb=38c5daddd9e0b972103bfde86c8f9852e64becd4;hp=70baee4947b3d066a5d6949575d2e1bb2ff1e4b1;hpb=b58f332f08c44ab7d6582684b718b603565b7c61;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 70baee4..28063d4 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -77,12 +77,12 @@ 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
   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
@@ -173,7 +173,8 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ynic:
-    address: 144.32.168.65
+    # really janet, because ynic is stupid about firewalling
+    address: 146.97.42.26
     parents: gw-ubc
     hostgroups: routing-infrastructure
 
@@ -185,7 +186,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts, apache2-hosts
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
@@ -201,7 +202,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, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, apache-https
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -252,12 +253,12 @@ 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
+    hostgroups: computers, acpid-hosts, service
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -265,7 +266,7 @@ servers:
   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
@@ -273,7 +274,7 @@ servers:
   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
@@ -281,11 +282,19 @@ servers:
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
-  purcell:
-    address: 82.195.75.69
+    hostgroups: computers, buildd, hasbootfs
+  kokkonen:
+    address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, buildd
+    hostgroups: computers, service, acpid-hosts, heavy-exim
+  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
@@ -300,25 +309,26 @@ servers:
   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
 
   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, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
     hostgroups: computers, buildd, hasbootfs
-  mayr:
-    address: 140.211.166.58
-    parents: gw-osuosl
-    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
+    #, bosserver
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -385,7 +395,7 @@ servers:
   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, apache-https
     contacts: bzed
 
   pergolesi:
@@ -408,7 +418,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts
+    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service, apache2-hosts
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -425,13 +435,13 @@ 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:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, service
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
@@ -439,7 +449,7 @@ servers:
   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, postgres83-hosts, apache-https
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -447,7 +457,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
@@ -485,7 +495,7 @@ servers:
   agnesi:
     address: 67.233.102.241
     parents: gw-agnesi
-    hostgroups: deadslow
+    hostgroups: deadslow, porterbox
 
   spontini:
     address: 206.12.19.14
@@ -499,18 +509,18 @@ servers:
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts
+    hostgroups: computers, bl460, acpid-hosts, service
   luchesi:
     address: 206.12.19.214
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts
+    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
   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
@@ -522,39 +532,39 @@ servers:
   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, apache2-hosts
   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
+    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, nfs-server
   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, 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, apache2-hosts
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    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
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -566,11 +576,11 @@ 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
@@ -586,15 +596,35 @@ servers:
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts
+    hostgroups: computers, dl585, acpid-hosts, service
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   traetta:
     address: 206.12.19.21
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts
+    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
+  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
 
   lebrun:
     address: 193.198.184.10
@@ -608,12 +638,12 @@ servers:
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, 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, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs
+    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service
     contacts: holger
 
   rem:
@@ -633,7 +663,7 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers
+    hostgroups: computers, hasbootfs, ntpsuckers, buildd
 
   schein:
     address: 149.20.20.6
@@ -647,30 +677,30 @@ servers:
   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, 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
+    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
+    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, apache2-hosts, mptraid
+    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service
   barber:
     address: 194.177.211.203
     parents: gw-grnet
@@ -682,7 +712,7 @@ servers:
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, hassrvfs
+    hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -694,25 +724,25 @@ servers:
   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, apache2-hosts
   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, 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
@@ -720,12 +750,12 @@ 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, apache2-hosts
     # which raid?
 
   abel:
@@ -837,9 +867,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
@@ -905,6 +932,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
@@ -942,6 +975,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
@@ -1013,12 +1049,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
@@ -1044,6 +1080,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
+  -
+    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
@@ -1084,27 +1125,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
 
   -
     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
@@ -1146,6 +1182,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 80 90 /vicepa"
+    hostgroups: hasvicepa
 
  ############ All Computers ############
  ####
@@ -1168,7 +1209,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
@@ -1182,6 +1223,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
@@ -1308,11 +1378,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
@@ -1354,12 +1424,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
@@ -1373,17 +1443,17 @@ 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
-    excludehosts: master, busoni, merkel
+    excludehosts: master, busoni, merkel, quantz
   -
     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: process - clamav - clamd
@@ -1647,7 +1717,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"
@@ -1705,6 +1775,12 @@ services:
     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
@@ -1783,7 +1859,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
   -
@@ -1800,12 +1876,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
@@ -1862,6 +1943,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
@@ -1887,37 +1973,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
@@ -1985,13 +2058,18 @@ 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: postgres84-hosts, postgres83-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
@@ -2000,7 +2078,7 @@ 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: klecker, chopin
+    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'"
@@ -2034,6 +2112,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
 
  ####
   #-
@@ -2056,11 +2174,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
 
  ###
@@ -2135,7 +2261,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
@@ -2184,12 +2310,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
 
  ############
   -
@@ -2207,6 +2333,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