X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=447c95b5622b0ad38caef80544a8d732a7ac8144;hb=041c0116ddf5808863f50be64ca699f332e2471b;hp=4b5d89cd22a1e4db59b07b8ddfb0adc3a673e4b1;hpb=65780afbdcd8f108980988eed0e6bb554bafa853;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4b5d89c..447c95b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,6 +98,10 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-grnet:
+    address: 194.177.211.193
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -169,6 +173,10 @@ servers:
     address: 150.203.164.38
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-sil:
+    address: 86.59.118.145
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -178,22 +186,22 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts
   merkel:
     address: 192.25.206.16
     parents: spohr
-    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, 
   merkel2:
     address: 192.25.206.71
     parents: merkel
     hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, spamd, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
   spohr2:
     address: 192.25.206.38
     parents: spohr
@@ -201,55 +209,59 @@ servers:
   peri:
     address: 192.25.206.15
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
+    hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, hasbootfs, lenny, single-cpu
+    hostgroups: computers, buildd, hasbootfs, single-cpu
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: spohr
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd
   paer:
     address: 192.25.206.11
     parents: spohr
-    hostgroups: computers, porterbox, lenny, hasbootfs, hashomefs, single-cpu
+    hostgroups: computers, porterbox, hasbootfs, hashomefs, single-cpu
   merulo:
     address: 192.25.206.58
     parents: spohr
-    hostgroups: computers, porterbox, lenny, hasusrfs
+    hostgroups: computers, porterbox, hasusrfs
+  alkman:
+    address: 192.25.206.63
+    parents: spohr
+    hostgroups: computers, buildd, acpid-hosts
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, lenny, hasvarfs
+    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
     contacts: joerg, bzed
   #morales:
   #  address: 82.195.75.97
   #  parents: gw-man-da
-  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
+  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, hasvarfs, hasusrfs
   #  contacts: bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny, hasorgfs
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs
     contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hassrvfs
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
     contacts: bzed
   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, lenny
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
     contacts: bzed
 #  auber:
 #    address: 82.195.75.101
@@ -259,59 +271,59 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, acpid-hosts, lenny
+    hostgroups: computers, service, dl360, acpid-hosts
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, kvmdomains
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, lenny, 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
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains
   byrd:
     address: 82.195.75.101
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
+    hostgroups: computers, service, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload, lenny
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, lenny, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
 
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, lenny, uploadqueue
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, lenny, smart
+    hostgroups: computers, buildd, smart
   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
+    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs, etch
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -319,148 +331,148 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
-    hostgroups: computers, porterbox, lenny, hassrvfs, hasbootfs
+    hostgroups: computers, porterbox, hassrvfs, hasbootfs
 
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs
   gluck:
     address: 150.203.164.38
     parents: gw-anu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, no-udev, hassrvfs, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-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, lenny, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
-  #  hostgroups: computers, single-cpu, lenny, porterbox, hasorgfs
+  #  hostgroups: computers, single-cpu, porterbox, hasorgfs
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts, bind9-hosts
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
-  #  hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
+  #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
     contacts: bzed
 
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts, hasorgfs, heavy-exim
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, heavy-exim
     contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, lenny, hasusrfs, hasorgfs
+    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, porterbox, sw-raid, single-cpu, 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, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, lenny, acpid-hosts
+    hostgroups: computers, acpid-hosts
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, lenny
+    hostgroups: computers, porterbox, sw-raid
     contacts: tjrc1
 
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, lenny, hasvarfs, hashomefs
+    hostgroups: computers, buildd, hasvarfs, hashomefs
     contacts: sfrost
 
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, buildd, lenny, ulogd-hosts, hassrvfs
+    hostgroups: computers, buildd, ulogd-hosts, hassrvfs
     contacts: joerg
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs
     contacts: joerg
 
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
+    hostgroups: computers, acpid-hosts, ulogd-hosts
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid, lenny
+    hostgroups: computers, no-udev, buildd, sw-raid
 
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart, lenny, hasorgfs
+    hostgroups: computers, porterbox, single-cpu, 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, lenny, incomingmailrelayed
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, incomingmailrelayed
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -477,79 +489,79 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, lenny, hassrvfs, hasbootfs, incomingmailrelayed2025
+    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025
     contacts: luk
 
   agnesi:
     address: 67.233.102.241
     parents: gw-agnesi
-    hostgroups: deadslow, lenny
+    hostgroups: deadslow
 
   spontini:
     address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, lenny, hasorgfs
+    hostgroups: computers, buildd, hasbootfs, hasorgfs
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
     parents: gw-ubcnew
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
   dijkstra:
     address: 206.12.19.218
     parents: gw-ubcnew
-    hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
+    hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
   luchesi:
     address: 206.12.19.214
     parents: gw-ubcnew
-    hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
+    hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
+    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, lenny, 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
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
   morricone:
     address: 206.12.19.9
     parents: gw-ubcnew
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim
+    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
   paganini:
     address: 206.12.19.10
     parents: gw-ubcnew
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs
   respighi:
     address: 137.82.84.83
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs
   vivaldi:
     address: 206.12.19.12
     parents: gw-ubcnew
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -558,65 +570,132 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
+  fano:
+    address: 206.12.19.110
+    parents: luchesi
+    hostgroups: computers, freebsd, squeeze
+  finzi:
+    address: 206.12.19.111
+    parents: luchesi
+    hostgroups: computers, freebsd, squeeze
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, lenny, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hasorgfs
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, hasorgfs
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, hasvarfs, hasusrfs
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, lenny, hasbootfs, incomingmailrelayed2025, hasorgfs
+    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, lenny, hashomefs
+    hostgroups: computers, buildd, hasbootfs, hashomefs
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, hashomefs, ntpsuckers
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, lenny, hassrvfs
+    hostgroups: computers, porterbox, hassrvfs
+  zandonai:
+    address: 80.245.147.46
+    parents: gw-HP-ftc
+    hostgroups: computers, buildd, hassrvfs
 
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs, hashomefs
+    hostgroups: computers, single-cpu, hasbootfs, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny
+    hostgroups: computers, single-cpu, hasbootfs, ntpsuckers
 
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, dl360, bind9-hosts, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, hassrvfs
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, lenny, sw-raid, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+
+  grieg:
+    address: 194.177.211.200
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts
+  rautavaara:
+    address: 194.177.211.199
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts, ulogd-hosts
+  fasch:
+    address: 194.177.211.201
+    parents: rautavaara
+    hostgroups: computers, freebsd, squeeze
+  holter:
+    address: 194.177.211.202
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+  barber:
+    address: 194.177.211.203
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs
+  biber:
+    address: 194.177.211.204
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs
+  cilea:
+    address: 194.177.211.205
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts
+  vitry:
+    address: 194.177.211.206
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts
+  krenek:
+    address: 194.177.211.207
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts
+  scelsi:
+    address: 194.177.211.208
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts
+  orff:
+    address: 194.177.211.209
+    parents: gw-grnet
+    hostgroups: computers, acpid-hosts, bind9-hosts
+  field:
+    address: 194.177.211.210
+    parents: rautavaara
+    hostgroups: computers, freebsd, squeeze
+
+  beethoven:
+    address: 86.59.118.146
+    parents: gw-sil
+    hostgroups: computers, hasbootfs
+
 
 #############################
 # host groups
@@ -639,6 +718,9 @@ hostgroups:
     alias: Systems too slow to run any real checks
   dialup:
     alias: Systems with slow network
+  freebsd:
+    alias: freebsd
+    private: 1
 
   porterbox:
     alias: developer accessible porter machines
@@ -683,8 +765,11 @@ hostgroups:
     alias: Hosts with only one CPU
     private: 1
 
-  lenny:
-    alias: Hosts running lenny, not etch
+  etch:
+    alias: Hosts running etch
+    private: 1
+  squeeze:
+    alias: Hosts running squeeze
     private: 1
 
   no-samhain:
@@ -796,6 +881,10 @@ hostgroups:
     # i.e. no port 25
     private: 1
 
+  ntpsuckers:
+    alias: "hosts who's ntp offset is often unknown"
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -846,19 +935,19 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs 90 95"
     hostgroups: computers
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries, klecker, kassia
+    excludehosts: ries, klecker, kassia, spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: ries, klecker, kassia
+    hosts: ries, klecker, kassia, spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -893,7 +982,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -978,8 +1067,7 @@ services:
   -
     name: puppet
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
-    hostgroups: lenny
-    excludehosts: agnesi
+    hostgroups: computers
 
  ####
   -
@@ -1047,7 +1135,7 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
-    excludehosts: zelenka
+    excludehosts: zelenka, zandonai
  ####
   -
     name: process - sshd
@@ -1067,27 +1155,6 @@ services:
     hosts: agnesi
     normal_check_interval:  180
 
-  -
-    name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
-    depends: network service - sshd
-    hostgroups: computers, deadslow
-    excludehostgroups: lenny
-    normal_check_interval:  60
-  -
-    name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
-    depends: network service - sshd
-    hostgroups: lenny
-    excludehosts: agnesi
-    normal_check_interval:  60
-  -
-    name: "network service - sshd - version - 2260"
-    check: "dsa_check_ssh_port_version!2260!OpenSSH_5.1p1 Debian-5"
-    depends: network service - sshd - 2260
-    hosts: agnesi
-    normal_check_interval:  60
- #
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
@@ -1112,6 +1179,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
+  -
+    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
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1120,9 +1192,7 @@ services:
  ###
   -
     name: process - ntpd
-    # sarge: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
-    # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
     excludehosts: zelenka
   -
@@ -1131,6 +1201,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: zelenka, ancina
+    excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
@@ -1153,9 +1224,7 @@ 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: lenny
-    hosts: rietz
-    excludehosts: agnesi
+    hostgroups: computers
 
  ### MAIL STUFF
  ###
@@ -1409,11 +1478,11 @@ services:
     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
+    excludehostgroups: single-cpu, freebsd
   -
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
-    hostgroups: single-cpu
+    hostgroups: single-cpu, freebsd
 
  ####
  ###
@@ -1443,7 +1512,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: rietz
+    excludehosts: rietz, grieg
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1478,8 +1547,7 @@ 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: lenny
-    excludehosts: agnesi
+    hostgroups: computers
  ###
   -
     name: process - cpqarrayd
@@ -1503,12 +1571,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: villa, lobos
+    excludehosts: villa, lobos, liszt, senfl, schein, rore
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
     normal_check_interval: 120
-    hosts: villa, lobos
+    hosts: villa, lobos, liszt
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
+    normal_check_interval: 120
+    hosts: senfl, schein, rore
  ###
   -
     name: RAID - areca
@@ -1554,11 +1627,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: no-udev
+    excludehostgroups: no-udev, freebsd
   -
     name: unexpected process - udev
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
-    hostgroups: no-udev
+    hostgroups: no-udev, freebsd
  ###
   -
     name: process - acpid
@@ -1570,6 +1643,11 @@ services:
     hostgroups: computers
     excludehostgroups: acpid-hosts, kvmdomains
 
+ ###
+  -
+    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
  ###
   -
     name: process - xinetd
@@ -1637,7 +1715,7 @@ services:
     depends: kassia:process - apache2 - master
     hosts: kassia-sec, kassia-ftp, kassia-volatile
 
-  # keyserver on raff
+  # keyserver on kaufmann
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
@@ -1829,9 +1907,9 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    contacts: luk
+    contacts: luk, pkern, HE
 
  ###
   #-
@@ -1876,7 +1954,7 @@ services:
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-    hosts: merkel, raff
+    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
@@ -1892,6 +1970,10 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: mirror sync - volatile
+    check: "dsa_check_mirrorsync!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org"
+    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
@@ -1957,3 +2039,8 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
     runfrom: dijkstra
     hosts: giustini
+  -
+    name: event log
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=789 $HOSTADDRESS$ public"
+    runfrom: dijkstra
+    hosts: giustini