X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ca0cf589bf4e3aef2c100dc4fceae3ef936e0d82;hb=e38d9f67d87358d8257b364489f85b11a20d6f21;hp=c1d60a62963f411ffedfa74b0f363c8d31e53ecb;hpb=9f18496feddca6443a6dc621d6875f531d71f7ec;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c1d60a6..ca0cf58 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -23,169 +23,163 @@
 servers:
   gw-man-da:
     address: 82.195.75.126
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg, bzed
   gw-man-da2:
     address: 82.195.75.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-brainfood:
     address: 70.103.162.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-brown.edu:
     address: 128.148.34.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-osuosl:
     address: 140.211.166.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-scanplus-villa:
     address: 212.211.132.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-scanplus-lobos:
     address: 212.211.132.249
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-mit-csail:
     address: 128.31.0.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-umn.edu:
     address: 128.101.240.222
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-dg-i.net:
     address: 93.94.132.102
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: bzed
   gw-freenet:
     address: 62.104.23.249
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sanger:
     address: 193.62.202.20
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: tjrc1, dave
   gw-1und1:
     address: 195.20.247.54
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: joerg
   gw-1und1-karlsruhe:
     address: 212.227.120.29
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-blackcat:
     address: 193.201.200.129
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-grnet:
     address: 194.177.211.193
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-nmmn:
-    address: 217.114.76.81
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-utwente:
     address: 130.89.149.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   #gw-ughent:
   #  address: 157.193.39.254
-  #  parents: gw-ubc
-  #  hostgroups: routing-infrastructure
-  gw-agnesi:
-    address: 65.173.90.22
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-ubc:
+  #  parents: gw-ubcece
+  #  hostgroups: layer3-infrastructure
+  sw-ubcece:
+    parents: tchaikovsky
+    hostgroups: layer2-infrastructure
+    contacts: lfilipoz
+    pingable: false
+    check_command: dsa_check_always_ok
+  gw-ubcece:
     address: 206.12.19.254
     parents: tchaikovsky
-    hostgroups: routing-infrastructure
+    hostgroups: layer3-infrastructure
     contacts: lfilipoz
   gw-carnet:
     address: 161.53.160.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-telegraaf:
-    address: 82.94.249.153
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-telegraaf2:
     address: 217.196.40.15
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contact_groups: +alioth-admins
   gw-helsinki:
     address: 128.214.173.25
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
     contacts: holger
-  gw-cst:
-    address: 213.157.2.23
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-aca:
     address: 130.239.18.97
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
 #  gw-esiee:
 #    address: 195.220.83.13
-#    parents: gw-ubc
-#    hostgroups: routing-infrastructure
+#    parents: gw-ubcece
+#    hostgroups: layer3-infrastructure
   gw-ghent:
     address: 193.191.17.50
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-anu:
     address: 150.203.164.38
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-sil:
     address: 86.59.118.145
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-arm:
     address: 82.44.141.46
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
     address: 146.97.42.26
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-c3sl:
     address: 200.17.202.254
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-zivit:
     address: 80.245.144.3
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-karlsruhe:
     address: 129.143.166.229
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-marist:
     address: 148.100.96.1
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-conova:
+    address: 217.196.149.238
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -208,14 +202,10 @@ servers:
     address: 192.25.206.57
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
-  raff:
-    address: 192.25.206.59
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -263,14 +253,14 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https, lenny
     contacts: bzed
+  bendel:
+    address: 82.195.75.101
+    parents: gw-man-da
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service, squeeze, megactl
-  nielsen:
-    address: 82.195.75.99
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, lenny
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -303,10 +293,6 @@ servers:
     address: 82.195.75.97
     parents: gw-man-da
     hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
-  byrd:
-    address: 82.195.75.92
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  lamb:
 #    address: 82.195.75.101
 #    parents: unger
@@ -318,7 +304,7 @@ servers:
   new-master:
     address: 82.195.75.110
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   master:
     address: 70.103.162.29
@@ -343,7 +329,7 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, squeeze
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -361,10 +347,18 @@ servers:
     address: 140.211.15.34
     parents: gw-osuosl
     hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
-  zee:
-    address: 140.211.166.16
+  parry:
+    address: 140.211.15.153
+    parents: gw-osuosl
+    hostgroups: computers, hassrvfs, squeeze, buildd, hassrvfs
+  partch:
+    address: 140.211.15.152
+    parents: gw-osuosl
+    hostgroups: computers, hassrvfs, squeeze, hassrvfs
+  piston:
+    address: 140.211.15.154
     parents: gw-osuosl
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
+    hostgroups: computers, hassrvfs, squeeze
 
   villa:
     address: 212.211.132.32
@@ -422,18 +416,6 @@ servers:
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
 
-  albeniz:
-    address: 193.62.202.27
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers, lenny
-    contacts: tjrc1, dave
-  goetz:
-    address: 193.62.202.26
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, lenny
-    contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -448,7 +430,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, lenny
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
     contacts: joerg
 
   schumann:
@@ -477,15 +459,10 @@ servers:
     parents: gw-blackcat
     hostgroups: computers, buildd, sw-raid, squeeze
 
-  pescetti:
-    address: 217.114.76.85
-    parents: gw-nmmn
-    hostgroups: computers, porterbox, smart, hasorgfs, squeeze
-
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
+    hostgroups: computers, service, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts, squeeze
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -511,30 +488,25 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, lenny
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze
     contacts: luk
 
-  agnesi:
-    address: 67.233.102.241
-    parents: gw-agnesi
-    hostgroups: deadslow, porterbox, lenny
-
   spontini:
     address: 206.12.19.14
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
     contacts: lfilipoz
   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, xinetd-hosts, squeeze
+    parents: sw-ubcece
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
   dijkstra:
     address: 206.12.19.218
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   luchesi:
     address: 206.12.19.214
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, bl460, acpid-hosts, service, squeeze
   tchaikovsky:
     address: 206.12.19.118
@@ -561,27 +533,27 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service, lenny
   bellini:
     address: 206.12.19.7
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, squeeze, autofs
   morricone:
     address: 206.12.19.9
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
   stabile:
     address: 206.12.19.13
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
-    parents: gw-ubc
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts, squeeze
   vivaldi:
     address: 206.12.19.12
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
@@ -601,39 +573,35 @@ servers:
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   gabrielli:
     address: 206.12.19.17
-    parents: tchaikovsky
-    hostgroups: computers, porterbox, lenny
+    parents: sw-ubcece
+    hostgroups: computers, porterbox, squeeze
   corelli:
     address: 206.12.19.16
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    parents: sw-ubcece
+    hostgroups: computers, buildd, squeeze
   lucatelli:
     address: 206.12.19.15
-    parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    parents: sw-ubcece
+    hostgroups: computers, buildd, squeeze
   rossini:
     address: 206.12.19.19
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   salieri:
     address: 206.12.19.20
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
   traetta:
     address: 206.12.19.21
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
-  schuetz:
-    address: 206.12.19.119
-    parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  locke:
 #    address: 206.12.19.120
-#    parents: tchaikovsky
+#    parents: sw-ubcece
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
   lotti:
     address: 206.12.19.121
-    parents: tchaikovsky
+    parents: sw-ubcece
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
   quantz:
     address: 206.12.19.122
@@ -674,7 +642,7 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim
   jenkins:
     address: 206.12.19.133
     parents: salieri
@@ -682,7 +650,19 @@ servers:
   blavet:
     address: 206.12.19.134
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
+  barriere:
+    address: 206.12.19.135
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  diabelli:
+    address: 206.12.19.136
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https
+  bizet:
+    address: 206.12.19.137
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -693,11 +673,6 @@ servers:
     parents: gw-carnet
     hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
 
-  tartini:
-    address: 82.94.249.158
-    parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs, service, lenny
-
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
@@ -718,11 +693,6 @@ servers:
     parents: gw-zivit
     hostgroups: computers, buildd, hassrvfs, squeeze
 
-  goedel:
-    address: 213.188.99.214
-    parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, buildd, lenny
-
   schein:
     address: 149.20.20.6
     parents: gw-isc
@@ -851,27 +821,27 @@ servers:
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, porterbox
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   hasse:
     address: 217.140.96.68
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   hebden:
     address: 217.140.96.69
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   henze:
     address: 217.140.96.70
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
 
   poulenc:
     address: 144.32.168.77
@@ -881,11 +851,23 @@ servers:
     address: 144.32.168.78
     parents: gw-ynic
     hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+  hildegard:
+    address: 144.32.168.74
+    parents: gw-ynic
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+  howells:
+    address: 144.32.168.75
+    parents: gw-ynic
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+  hummel:
+    address: 144.32.168.76
+    parents: gw-ynic
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
 
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
     contacts: faw
 
   zemlinsky:
@@ -898,6 +880,15 @@ servers:
     parents: gw-marist
     hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
 
+  sompek:
+    address: 217.196.149.225
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+  stadler:
+    address: 217.196.149.226
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+
 #############################
 # host groups
 #
@@ -908,18 +899,23 @@ hostgroups:
   computers:
     alias: computers
     private: 1
-  routing-infrastructure:
-    alias: Internet routers and friends
-    extinfo-icon_image: base/switch40.png
+  layer2-infrastructure:
+    alias: layer 2 devices like switches
+    extinfo-icon_image: symbols/switch.png
+    extinfo-icon_image_alt: switch
+  layer3-infrastructure:
+    alias: layer 3 devices like routers
+    extinfo-icon_image: symbols/router.png
     extinfo-icon_image_alt: router
   notacomputer:
     alias: Systems that are not really systems.  Yeah :)
     private: 1
-  deadslow:
-    alias: Systems too slow to run any real checks
   freebsd:
     alias: freebsd
     private: 1
+  armhf:
+    alias: armhf
+    private: 1
   sparc:
     alias: sparc
     private: 1
@@ -1040,9 +1036,6 @@ hostgroups:
   postgres90-hosts:
     alias: hosts running postgres90
     private: 1
-  mysql-hosts:
-    alias: hosts running mysql
-    private: 1
   no-ulogd:
     alias: hosts not running ulogd
     private: 1
@@ -1077,9 +1070,6 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
-  smart:
-    alias: hosts with smartd
-    private: 1
   hasbootfs:
     alias: hosts with a /boot filesystem
     private: 1
@@ -1118,6 +1108,9 @@ hostgroups:
   brokensamhain:
     alias: machines that can not run samhain
     private: 1
+  high-RTT:
+    alias: machines with hight round trip times
+    private: 1
 
 #############################
 # servicegroups
@@ -1137,6 +1130,8 @@ servicegroups:
     alias: apt upgrade status
   samhain:
     alias: samhain integrity status
+  time:
+    alias: time stuff
   security:
     alias: security
     servicegroup_members: apt, weaksshkeys, kernel, samhain
@@ -1149,14 +1144,21 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure
+    excludehostgroups: layer3-infrastructure, high-RTT
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
+  -
+    name: PING
+    check: "check_ping!600.0,20%!900.0,40%"
+    hostgroups: high-RTT
     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
+    hostgroups: layer3-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1171,6 +1173,13 @@ services:
     servicegroups: diskspace
     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
+    excludehosts: sibelius
+  -
+    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 -X nfs 95 98"
+    hosts: sibelius
+
   -
     name: disk usage on /
     servicegroups: diskspace
@@ -1212,7 +1221,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, tartini, powell, piatti
+    hosts: saens, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1258,47 +1267,47 @@ services:
   -
     name: disk usage on /srv/farm-snapshot/farm-01
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-01"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-01"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-23
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-23"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-23"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-45
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-45"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-45"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-67
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-67"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-67"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-89
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-89"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-89"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-ab
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-ab"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-ab"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-cd
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-cd"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/farm-snapshot/farm-cd"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-f
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-f"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-f"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-e
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-e"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 85 /srv/farm-snapshot/farm-e"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
@@ -1491,12 +1500,6 @@ services:
     normal_check_interval:  60
     notification_interval: 1440
 
-  -
-    name: "network service - sshd - 2260"
-    check: dsa_check_ssh_port!2260
-    hosts: agnesi
-    normal_check_interval:  180
-
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
@@ -1520,18 +1523,18 @@ 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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
-    excludehostgroups: freebsd
-    excludehosts: vasks, wagner, harris, hartmann, hasse, henze, hebden, hoiby
+    excludehostgroups: freebsd, armhf
+    excludehosts: vasks, wagner
   -
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
     hostgroups: freebsd
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
-    hosts: harris, hartmann, hasse, henze, hebden, hoiby
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
+    hostgroups: armhf
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1543,6 +1546,7 @@ services:
     name: process - ntpd
     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
+    servicegroups: time
   -
     name: network service - ntp
     check: dsa_check_ntp
@@ -1550,12 +1554,14 @@ services:
     depends: process - ntpd
     excludehosts: ancina
     excludehostgroups: ntpsuckers
+    servicegroups: time
   #
   -
     name: network service - time
     check: dsa_check_time
     hosts: ancina
     depends: process - xinetd
+    servicegroups: time
 
  ###
   -
@@ -1836,6 +1842,7 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
+    excludehosts: wagner, vasks
     normal_check_interval: 60
   -
     name: setup - ud-ldap freshness
@@ -1901,7 +1908,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd, abel, alwyn, vasks
+    excludehosts: grieg, abel, alwyn, vasks
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1912,6 +1919,10 @@ services:
     name: "host SSL cert"
     nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi"
     hostgroups: computers
+  -
+    name: "pg SSL cert"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/pg-ubcece.debian.org-chained.pem"
+    hosts: danzi
 
  ############ Processes/Services that only run on some computers ############
  ####
@@ -1938,6 +1949,11 @@ services:
     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
     excludehosts: vasks, wagner
+    excludehostgroups: armhf
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: armhf
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -2086,7 +2102,7 @@ services:
   -
     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, byrd, vasks
+    hosts: grieg, vasks
  ###
   -
     name: process - xinetd
@@ -2158,14 +2174,8 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: kassia, klecker
+    excludehosts: klecker
     depends: process - apache2 - master
-  -
-    name: network service - http
-    check: check_http
-    depends: kassia:process - apache2 - master
-    #hosts: kassia-sec, kassia-ftp, kassia-volatile
-    hosts: kassia-ftp, kassia-volatile
   -
     name: network service - http
     check: check_http
@@ -2222,28 +2232,21 @@ services:
     name: process - vsftp - listener
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia, klecker
+    excludehosts: klecker
   -
     name: process - vsftp - instance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia, klecker
+    excludehosts: klecker
   -
     name: network service - ftp
     check: check_ftp
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia, klecker
+    excludehosts: klecker
     depends: process - vsftp - listener
   -
     name: network service - ftp
     check: check_ftp
-    #hosts: kassia-sec, kassia-ftp
-    hosts: kassia-ftp
-    depends: kassia:process - xinetd
-  -
-    name: network service - ftp
-    check: check_ftp
-    #hosts: kassia-sec, kassia-ftp
     hosts: klecker-ftp
     depends: klecker:process - xinetd
 
@@ -2312,17 +2315,6 @@ services:
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: beethoven
- ####
-  -
-    name: process - mysql - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C mysqld_safe -a '/bin/sh /usr/bin/mysqld_safe'"
-    hostgroups: mysql-hosts
-  -
-    name: process - mysql - workers
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u mysql -C mysqld -a /usr/sbin/mysqld"
-    hostgroups: mysql-hosts
-    depends: process - mysql - master
-
  ####
   -
     name: process - stunnel4 - postgres-udd
@@ -2340,23 +2332,6 @@ services:
     hostgroups: squeeze, wheezy
     excludehosts: fano, fasch, field, finzi
  ####
-  -
-    name: process - krb - kdc
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kdc -a '/usr/lib/heimdal-servers/kdc --config-file=/etc/heimdal-kdc/kdc.conf'"
-    hosts: schuetz, byrd
-  -
-    name: process - krb - iprop - slave
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-slave -a '/usr/sbin/ipropd-slave byrd.debian.org'"
-    hosts: schuetz
-  -
-    name: process - krb - iprop - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-master -a '/usr/sbin/ipropd-master'"
-    hosts: byrd
-  -
-    name: process - krb - kpasswdd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kpasswdd -a '/usr/lib/heimdal-servers/kpasswdd'"
-    hosts: byrd
- ###
   -
     name: process - UPS - nut usbhid-ups - ups1
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"
@@ -2418,6 +2393,12 @@ services:
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
     contact_groups: buildd
+ ####
+  -
+    name: network service - gobby
+    check: check_tcp!6523
+    hosts: gombert
+    contact_groups: gobby
 
  ###
   #-
@@ -2430,10 +2411,6 @@ services:
 #    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
 #    hosts: paer
  ###
-  -
-    name: process - smartd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C smartd -a '/usr/sbin/smartd --pidfile /var/run/smartd.pid --interval=1800'"
-    hostgroups: smart
 
  ############ NFS Stuff ############
  ####
@@ -2570,6 +2547,6 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=952 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=2041 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini