master running xinetd
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 27779bd..d7e01fb 100644 (file)
 servers:
   gw-man-da:
     address: 82.195.75.126
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: joerg, bzed
   gw-man-da2:
     address: 82.195.75.46
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-brainfood:
     address: 70.103.162.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-brown.edu:
     address: 128.148.34.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-osuosl:
     address: 140.211.166.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-scanplus-villa:
     address: 212.211.132.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-scanplus-lobos:
     address: 212.211.132.249
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-mit-csail:
     address: 128.30.0.254
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-xs4all:
     address: 194.109.137.217
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-umn.edu:
     address: 128.101.240.222
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-dg-i.net:
     address: 93.94.130.190
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: bzed
   gw-freenet:
     address: 62.104.23.249
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-sanger:
     address: 193.62.202.18
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: tjrc1
   gw-frost:
     address: 130.81.242.195
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-1und1:
     address: 195.20.247.54
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: joerg
   gw-1und1-karlsruhe:
     address: 212.227.120.29
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-blackcat:
     address: 193.201.200.129
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-grnet:
     address: 194.177.211.193
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-utwente:
     address: 130.89.149.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   #gw-ughent:
   #  address: 157.193.39.254
-  #  parents: gw-ubcnew
+  #  parents: gw-ubc
   #  hostgroups: routing-infrastructure
   gw-agnesi:
     address: 65.173.90.22
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ubc:
-    address: 137.82.84.94
-    parents: gw-ubcnew
-    hostgroups: routing-infrastructure
-    contacts: lfilipoz
-  gw-ubcnew:
     address: 206.12.19.254
     parents: tchaikovsky
     hostgroups: routing-infrastructure
     contacts: lfilipoz
   gw-carnet:
     address: 161.53.160.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-telegraaf:
     address: 82.94.249.153
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-helsinki:
     address: 128.214.173.25
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: holger
   gw-telefonica:
     address: 195.71.99.193
-    parents: gw-ubcnew
-    hostgroups: routing-infrastructure
-  gw-ball:
-    address: 78.32.9.209
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-cst:
     address: 213.188.99.215
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-aca:
     address: 130.239.18.97
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-esiee:
     address: 195.220.83.13
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ghent:
     address: 193.191.17.50
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-anu:
     address: 150.203.164.38
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-sil:
     address: 86.59.118.145
-    parents: gw-ubcnew
+    parents: gw-ubc
     hostgroups: routing-infrastructure
 
   global:
@@ -190,11 +181,11 @@ servers:
   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
+    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, 
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, xinetd-hosts
   merkel2:
     address: 192.25.206.71
     parents: merkel
@@ -203,10 +194,6 @@ servers:
     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
-  spohr2:
-    address: 192.25.206.38
-    parents: gw-HP-ftc
-    hostgroups: secondary-IPs
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -280,24 +267,32 @@ servers:
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts, kvmdomains, xinetd-hosts
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains, xinetd-hosts
   byrd:
     address: 82.195.75.101
     parents: unger
     hostgroups: computers, service, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
+  ball:
+    address: 82.195.75.70
+    parents: gw-man-da
+    hostgroups: computers, buildd, no-udev, hasbootfs, hashomefs, ntpsuckers
+  purcell:
+    address: 82.195.75.69
+    parents: gw-man-da
+    hostgroups: computers, buildd, single-cpu
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload, xinetd-hosts
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -307,7 +302,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
 
   mayer:
     address: 140.211.166.78
@@ -324,7 +319,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs, etch
+    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs, etch, xinetd-hosts
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -341,20 +336,20 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs
+    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
+    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
+    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
+    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
@@ -366,7 +361,7 @@ servers:
   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
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
@@ -375,12 +370,12 @@ 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
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, xinetd-hosts
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
 
   argento:
     address: 93.94.130.160
@@ -409,7 +404,7 @@ servers:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -436,7 +431,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
     contacts: joerg
 
   schumann:
@@ -446,15 +441,15 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-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
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -473,7 +468,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
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, incomingmailrelayed, xinetd-hosts
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -490,7 +485,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025
+    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts
     contacts: luk
 
   agnesi:
@@ -499,17 +494,14 @@ servers:
     hostgroups: deadslow
 
   spontini:
-    address: 137.82.84.65
+    address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hasorgfs
+    hostgroups: computers, buildd, hasbootfs, hassrvfs
     contacts: lfilipoz
-  tchaikovsky:
-    address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
   ravel:
     address: 206.12.19.5
     parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
@@ -518,6 +510,9 @@ servers:
     address: 206.12.19.214
     parents: tchaikovsky
     hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
+  tchaikovsky:
+    address: 206.12.19.118
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
@@ -529,7 +524,7 @@ servers:
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
   duarte:
     address: 206.12.19.114
     parents: dijkstra
@@ -537,29 +532,29 @@ servers:
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim
+    hostgroups: computers, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts
   bellini:
-    address: 137.82.84.79
+    address: 206.12.19.7
     parents: gw-ubc
     hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim
+    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts
   stabile:
-    address: 137.82.84.72
+    address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts
   cimarosa:
-    address: 137.82.84.80
+    address: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim, apache2-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
     hostgroups: computers, hasbootfs, aacraid, hassrvfs
   respighi:
-    address: 137.82.84.83
+    address: 206.12.19.11
     parents: gw-ubc
     hostgroups: computers, hasbootfs, aacraid, hassrvfs
   vivaldi:
@@ -608,15 +603,10 @@ servers:
     parents: gw-telefonica
     hostgroups: computers, buildd, hasbootfs, hashomefs
 
-  ball:
-    address: 78.32.9.213
-    parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, hashomefs, ntpsuckers
-
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hassrvfs
+    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
@@ -634,7 +624,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
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts
 
   praetorius:
     address: 130.239.18.121
@@ -698,7 +688,7 @@ servers:
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs
+    hostgroups: computers, hasbootfs, aacraid
 
 
 #############################
@@ -720,8 +710,6 @@ hostgroups:
     private: 1
   deadslow:
     alias: Systems too slow to run any real checks
-  dialup:
-    alias: Systems with slow network
   freebsd:
     alias: freebsd
     private: 1
@@ -814,6 +802,9 @@ hostgroups:
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
+  xinetd-hosts:
+    alias: hosts providing services via xinetd
+    private: 1
   #postgres81-hosts:
   #  alias: hosts running postgres81
   #  private: 1
@@ -919,14 +910,14 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure, dialup
+    excludehostgroups: routing-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
-    hostgroups: routing-infrastructure, dialup
+    hostgroups: routing-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1002,11 +993,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
     hosts: voltaire
-  -
-    name: disk usage on /mnt/sdb1
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/sdb1"
-    hosts: spontini
   -
     name: disk usage on /x
     servicegroups: diskspace
@@ -1016,7 +1002,8 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa
+    hosts: samosa, stabile, sibelius
+
   -
     name: disk usage on /srv/morgue.debian.org
     servicegroups: diskspace
@@ -1032,6 +1019,31 @@ services:
     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"
+    hosts: stabile,sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-0123
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-0123"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-4567
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-4567"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-89ab
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-89ab"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-cdef
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cdef"
+    hosts: sibelius
 
  ############ All Computers ############
  ####
@@ -1040,6 +1052,7 @@ 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
  ####
@@ -1053,7 +1066,7 @@ services:
   -
     name: backup server config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: bartok
+    hosts: bartok, beethoven
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1552,6 +1565,11 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
+    excludehostgroups: squeeze
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: squeeze
  ###
   -
     name: process - cpqarrayd
@@ -1585,7 +1603,12 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
     normal_check_interval: 120
-    hosts: senfl, schein, rore
+    hosts: senfl, schein
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant --fan-high"
+    normal_check_interval: 120
+    hosts: rore
  ###
   -
     name: RAID - areca
@@ -1656,14 +1679,12 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: zelenka, ancina, draghi
-    hostgroups: rsyncd-hosts
+    hostgroups: xinetd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: zelenka, ancina, draghi
-    excludehostgroups: rsyncd-hosts
+    excludehostgroups: xinetd-hosts
  ###
   -
     name: network service - finger
@@ -1694,7 +1715,7 @@ services:
     name: process - nagios3
     # there is always one extra process per check currently running..
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
-    hosts: spohr
+    hosts: tchaikovsky
 
  ###
   -
@@ -1730,7 +1751,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz
+    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, cimarosa
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1739,26 +1760,15 @@ services:
     # ries             ftp-master.debian.org
     # chopin           security-master.debian.org
     # spohr            rt.debian.org
-    # spohr2           nagios.debian.org
+    # tchaikovsky      nagios.debian.org
     # draghi           db.debian.org
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
-    hosts: ries, chopin, spohr, spohr2, draghi, merkel2, liszt, widor, rietz
+    # cimarosa         buildd.debian.org
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, cimarosa
     depends: network service - https
     normal_check_interval: 60
 
-  # spohr
-  -
-    name: network service - https
-    check: check_https
-    hosts: spohr2
-    depends: "spohr:process - apache2 - master"
-    normal_check_interval: 120
-  -
-    name: network service - http
-    check: check_http
-    hosts: spohr2
-    depends: "spohr:process - apache2 - master"
   # merkel
   -
     name: network service - https
@@ -1877,11 +1887,6 @@ services:
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
     hosts: samosa
-  -
-    name: process - stunnel4 - postgres-udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
-    hosts: merkel, master
-
   -
     name: udd stunnel - master cert
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
@@ -2029,6 +2034,17 @@ services:
     name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
     hosts: global
+  -
+    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
+  -
+    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
+
  ############
   -
     name: ping alive check