X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f803cc2e6637f3a0a8d89e3572f09dd7db65aff9;hb=b738ce9ac9c23faca0b12efede5678feb7210271;hp=432f5b90952dc1169e21a2d7aa4f5e605e82f9f6;hpb=6187efda273d14694b63880e0d1ca72842cdd5ee;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 432f5b9..f803cc2 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -140,12 +140,8 @@ servers:
     address: 195.71.99.193
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-ball:
-    address: 78.32.9.209
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-cst:
-    address: 213.188.99.215
+    address: 213.157.2.23
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-isc:
@@ -181,15 +177,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
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, ulogd-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
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, ulogd-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
@@ -201,21 +197,21 @@ servers:
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ulogd-hosts
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hasbootfs, single-cpu
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, ulogd-hosts
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasbootfs, hashomefs, single-cpu
+    hostgroups: computers, porterbox, hasbootfs, hashomefs
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
@@ -223,18 +219,13 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts
+    hostgroups: computers, buildd, acpid-hosts, ulogd-hosts
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
+    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs, ulogd-hosts
     contacts: joerg, bzed
-  #morales:
-  #  address: 82.195.75.97
-  #  parents: gw-man-da
-  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, hasvarfs, hasusrfs
-  #  contacts: bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -243,12 +234,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, hassrvfs
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -267,55 +258,55 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, kvmdomains, ulogd-hosts
   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
-  byrd:
-    address: 82.195.75.101
-    parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
+    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts
+  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
+    parents: gw-man-da
+    hostgroups: computers, buildd, ulogd-hosts
 
   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, mptraid
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, ulogd-hosts
 
 
   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
+    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
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
-  malo:
-    address: 140.211.166.27
-    parents: gw-osuosl
-    hostgroups: computers, buildd, smart
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
   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, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -323,7 +314,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -332,24 +323,24 @@ 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, ulogd-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, ulogd-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, ulogd-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, ulogd-hosts
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
-  #  hostgroups: computers, single-cpu, porterbox, hasorgfs
+  #  hostgroups: computers, porterbox, hasorgfs
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
@@ -357,7 +348,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
@@ -366,23 +357,23 @@ 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, ulogd-hosts
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
     contacts: bzed
 
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, heavy-exim
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs
     contacts: bzed
 
   pergolesi:
@@ -394,18 +385,18 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, ulogd-hosts
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, megaraid
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -416,7 +407,7 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs
+    hostgroups: computers, buildd, hasvarfs, hashomefs, ulogd-hosts
     contacts: sfrost
 
   puccini:
@@ -427,7 +418,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:
@@ -437,15 +428,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, bind9-hosts, kvmdomains, ulogd-hosts
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -454,17 +445,17 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, ulogd-hosts
 
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart, hasorgfs
+    hostgroups: computers, porterbox, smart, hasorgfs
 
   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
@@ -481,7 +472,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
     contacts: luk
 
   agnesi:
@@ -497,7 +488,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: tchaikovsky
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
+    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
@@ -508,7 +499,7 @@ servers:
     hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, ulogd-hosts
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
@@ -516,11 +507,11 @@ servers:
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, ulogd-hosts
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
   duarte:
     address: 206.12.19.114
     parents: dijkstra
@@ -528,7 +519,7 @@ 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, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
@@ -536,19 +527,19 @@ servers:
   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: 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: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim, apache2-hosts
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
@@ -573,6 +564,18 @@ servers:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze
+  gabrielli:
+    address: 206.12.19.17
+    parents: tchaikovsky
+    hostgroups: computers
+  corelli:
+    address: 206.12.19.16
+    parents: tchaikovsky
+    hostgroups: computers, buildd, ulogd-hosts
+  lucatelli:
+    address: 206.12.19.15
+    parents: tchaikovsky
+    hostgroups: computers, buildd, ulogd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -581,7 +584,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
   tartini:
     address: 82.94.249.158
@@ -597,99 +600,110 @@ servers:
   rem:
     address: 195.71.99.217
     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
+    hostgroups: computers, buildd, hasbootfs, hashomefs, ulogd-hosts
 
   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
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
 
-  escher:
-    address: 213.188.99.215
-    parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, hasbootfs, ntpsuckers, ulogd-hosts
 
   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, ulogd-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
+  pettersson:
+    address: 130.239.18.123
+    parents: gw-aca
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs, ulogd-hosts
 
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts, ulogd-hosts, megaraid
   fasch:
     address: 194.177.211.201
     parents: rautavaara
     hostgroups: computers, freebsd, squeeze
+    #, mptraid
   holter:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, mptraid
   barber:
     address: 194.177.211.203
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, mptraid
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, mptraid
   krenek:
     address: 194.177.211.207
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, mptraid
   scelsi:
     address: 194.177.211.208
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts
+    hostgroups: computers, acpid-hosts, mptraid
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid
   field:
     address: 194.177.211.210
     parents: rautavaara
     hostgroups: computers, freebsd, squeeze
+    #, mptraid
 
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid
+    hostgroups: computers, hasbootfs, aacraid, ulogd-hosts, nfs-server
+  merikanto:
+    address: 86.59.118.147
+    parents: gw-sil
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts
+  englund:
+    address: 86.59.118.148
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
+  lindberg:
+    address: 86.59.118.149
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
 
 
 #############################
@@ -711,8 +725,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
@@ -756,8 +768,11 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
-  single-cpu:
-    alias: Hosts with only one CPU
+  megaraid:
+    alias: Hosts with LSI Logic MegaRAID
+    private: 1
+  mptraid:
+    alias: Hosts with LSI Logic Fusion-MPT
     private: 1
 
   etch:
@@ -767,10 +782,6 @@ hostgroups:
     alias: Hosts running squeeze
     private: 1
 
-  no-samhain:
-    alias: hosts not running samhain properly
-    private: 1
-
   kvmdomains:
     alias: Hosts that are KVM domains
     private: 1
@@ -805,6 +816,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
@@ -910,14 +924,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
@@ -930,7 +944,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
     hostgroups: computers
   -
     name: disk usage on /
@@ -977,7 +991,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, escher
+    hosts: saens, puccini, merkel, tartini, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1002,7 +1016,14 @@ 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, busoni
+
+  -
+    name: disk usage on /var/log
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
+    hosts: busoni
+
   -
     name: disk usage on /srv/morgue.debian.org
     servicegroups: diskspace
@@ -1012,12 +1033,37 @@ services:
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
-    hosts: stabile
+    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"
+    hosts: stabile,sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-0123
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 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 90 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 90 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 90 95 /srv/farm-snapshot/farm-cdef"
+    hosts: sibelius
 
  ############ All Computers ############
  ####
@@ -1065,13 +1111,11 @@ services:
     name: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
-    excludehostgroups: no-samhain
   -
     name: samhain
     servicegroups: samhain
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
-    excludehostgroups: no-samhain
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
@@ -1091,11 +1135,11 @@ services:
     name: load
     nrpe: "/usr/lib/nagios/plugins/check_load -w 140,120,100 -c 240,220,200"
     hostgroups: highload
-    excludehosts: rietz
+ ####
   -
-    name: load
-    nrpe: "/usr/lib/nagios/plugins/check_load -w 200,200,200 -c 350,350,350"
-    hosts: rietz
+    name: uptime check
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-uptime"
+    hostgroups: computers
  ####
   -
     name: processes - zombies
@@ -1216,6 +1260,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
+
+  -
+    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
 
  ### MAIL STUFF
  ###
@@ -1224,17 +1274,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, rietz, merkel, byrd
+    excludehosts: master, busoni, merkel
   -
     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, rietz, merkel, byrd
+    excludehosts: master, busoni, merkel
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz, merkel, byrd
+    hosts: master, busoni, merkel
  ###
   -
     name: process - clamav - clamd
@@ -1282,18 +1332,18 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: rietz
+    hosts: busoni
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: rietz
+    hosts: busoni
   #
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, rietz
+    excludehosts: liszt, busoni
 
  ###
   #-
@@ -1465,15 +1515,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
  ###
-  -
-    name: process - irqbalance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
-    hostgroups: computers
-    excludehostgroups: single-cpu, freebsd
   -
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
-    hostgroups: single-cpu, freebsd
+    hostgroups: computers
 
  ####
  ###
@@ -1503,7 +1548,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: rietz, grieg
+    excludehosts: grieg
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1537,9 +1582,8 @@ 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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
- ###
   -
     name: process - cpqarrayd
     servicegroups: raid
@@ -1572,7 +1616,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
@@ -1585,6 +1634,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
     hostgroups: aacraid
+ ###
+  -
+    name: RAID - megaraid
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
+    hostgroups: megaraid
  ###
   -
     name: RAID - 3ware
@@ -1596,7 +1651,7 @@ services:
     name: RAID - MPT
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-mpt"
-    hosts: master
+    hostgroups: mptraid
 
  ###
   -
@@ -1643,14 +1698,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
@@ -1658,12 +1711,12 @@ services:
     hosts: draghi
     depends: process - xinetd
  ###
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hostgroups: rsyncd-hosts
-    depends: process - xinetd
-
+#  -
+#    name: network service - rsync
+#    check: check_tcp!873
+#    hostgroups: rsyncd-hosts
+#    depends: process - xinetd
+#
   -
     name: network service - rsync
     check: check_tcp!873
@@ -1717,7 +1770,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, cimarosa
+    hosts: ries, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1730,8 +1783,8 @@ services:
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    # cimarosa		buildd.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, cimarosa
+    # grieg		buildd.debian.org
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
     depends: network service - https
     normal_check_interval: 60
 
@@ -1853,11 +1906,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"
@@ -1887,7 +1935,7 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -u buildd -C buildd -a '/usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     contacts: luk, pkern, HE
 
@@ -2010,6 +2058,11 @@ services:
     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
 
  ############
   -