X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=bfbb63d5512da6b8a9cb7b564f59d9527c0386d9;hb=cfdfdc61ba08afd762293d96d3cfaf7d7ad6613e;hp=0445a1432777edb4423d75668550edd6b8084d52;hpb=f49f6fa1f9c4f1d9e569c365a5965885e8086b94;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0445a14..bfbb63d 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -59,10 +59,6 @@ servers:
     address: 128.31.0.1
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-xs4all:
-    address: 194.109.137.217
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-umn.edu:
     address: 128.101.240.222
     parents: gw-ubc
@@ -81,10 +77,6 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: tjrc1, dave
-  gw-frost:
-    address: 130.81.27.83
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-1und1:
     address: 195.20.247.54
     parents: gw-ubc
@@ -102,10 +94,6 @@ servers:
     address: 194.177.211.193
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-nmmn:
-    address: 217.114.76.81
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-utwente:
     address: 130.89.149.1
     parents: gw-ubc
@@ -141,10 +129,6 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: holger
-  gw-telefonica:
-    address: 195.71.99.193
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-cst:
     address: 213.157.2.23
     parents: gw-ubc
@@ -190,6 +174,18 @@ servers:
     address: 80.245.144.3
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-karlsruhe:
+    address: 129.143.166.229
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
+  gw-marist:
+    address: 148.100.96.1
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
+  gw-conova:
+    address: 217.196.146.254
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -233,7 +229,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze, brokensamhain
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -241,11 +237,11 @@ servers:
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasusrfs, squeeze, brokensamhain
+    hostgroups: computers, porterbox, hasusrfs, squeeze
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts, squeeze, brokensamhain
+    hostgroups: computers, buildd, acpid-hosts, squeeze
 
   sperger:
     address: 82.195.75.34
@@ -267,6 +263,10 @@ 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
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
@@ -274,7 +274,7 @@ servers:
   nielsen:
     address: 82.195.75.99
     parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, lenny
+    hostgroups: computers, acpid-hosts, service, squeeze, megactl
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -311,10 +311,18 @@ servers:
     address: 82.195.75.92
     parents: unger
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
-  lamb:
-    address: 82.195.75.101
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+#  lamb:
+#    address: 82.195.75.101
+#    parents: unger
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  czerny:
+    address: 82.195.75.109
+    parents: gw-man-da
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+  new-master:
+    address: 82.195.75.110
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   master:
     address: 70.103.162.29
@@ -329,7 +337,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
+    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
 
   franck:
     address: 128.148.34.3
@@ -339,7 +347,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,6 +369,18 @@ servers:
     address: 140.211.166.16
     parents: gw-osuosl
     hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny
+  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, hassrvfs, squeeze
 
   villa:
     address: 212.211.132.32
@@ -396,11 +416,6 @@ servers:
   #  parents: gw-mit-csail
   #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs
 
-  klecker:
-    address: 194.109.137.218
-    parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts, lenny
-
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
@@ -409,7 +424,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
 
   widor:
@@ -446,16 +461,10 @@ servers:
     hostgroups: computers, porterbox, sw-raid, sparc, squeeze
     contacts: tjrc1, dave
 
-  voltaire:
-    address: 72.66.115.54
-    parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs, lenny
-    contacts: sfrost
-
   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:
@@ -484,15 +493,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
@@ -505,11 +509,20 @@ servers:
     address: 130.89.149.227
     parents: kassia
     hostgroups: secondary-IPs
+  klecker:
+    address: 130.89.148.10
+    parents: gw-utwente
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+  klecker-ftp:
+    address: 130.89.148.12
+    parents: klecker
+    hostgroups: secondary-IPs
+
 
   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:
@@ -540,7 +553,7 @@ servers:
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, squeeze
   brahms:
     address: 206.12.19.115
     parents: dijkstra
@@ -568,7 +581,7 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze
+    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
@@ -580,7 +593,7 @@ servers:
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny, autofs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -592,27 +605,27 @@ servers:
   fano:
     address: 206.12.19.110
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   finzi:
     address: 206.12.19.111
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
-    hostgroups: computers, porterbox, lenny
+    hostgroups: computers, porterbox, squeeze
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, squeeze
   lucatelli:
     address: 206.12.19.15
     parents: tchaikovsky
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, squeeze
   rossini:
     address: 206.12.19.19
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze, apache2-hosts
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
@@ -625,10 +638,10 @@ servers:
     address: 206.12.19.119
     parents: tchaikovsky
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
-  locke:
-    address: 206.12.19.120
-    parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
+#  locke:
+#    address: 206.12.19.120
+#    parents: tchaikovsky
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
   lotti:
     address: 206.12.19.121
     parents: tchaikovsky
@@ -648,7 +661,7 @@ servers:
   danzi:
     address: 206.12.19.125
     parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: traetta
@@ -673,6 +686,14 @@ servers:
     address: 206.12.19.132
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  jenkins:
+    address: 206.12.19.133
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  blavet:
+    address: 206.12.19.134
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts, nfs-client, autofs
 
   lebrun:
     address: 193.198.184.10
@@ -706,7 +727,7 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, squeeze, brokensamhain
+    hostgroups: computers, buildd, hassrvfs, squeeze
 
   goedel:
     address: 213.188.99.214
@@ -743,7 +764,7 @@ servers:
   fasch:
     address: 194.177.211.201
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
   holter:
     address: 194.177.211.202
@@ -780,7 +801,7 @@ servers:
   field:
     address: 194.177.211.210
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
 
   beethoven:
@@ -805,6 +826,14 @@ servers:
     parents: gw-sil
     hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
     # which raid?
+  eder:
+    address: 86.59.118.151
+    parents: gw-sil
+    hostgroups: computers, porterbox, squeeze, hassrvfs
+  eysler:
+    address: 86.59.118.152
+    parents: gw-sil
+    hostgroups: computers, buildd, squeeze
 
   abel:
     address: 217.140.96.56
@@ -830,6 +859,30 @@ servers:
     address: 217.140.96.61
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, squeeze
+  harris:
+    address: 217.140.96.66
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox
+  hartmann:
+    address: 217.140.96.67
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+  hasse:
+    address: 217.140.96.68
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+  hebden:
+    address: 217.140.96.69
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+  henze:
+    address: 217.140.96.70
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+  hoiby:
+    address: 217.140.96.71
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
 
   poulenc:
     address: 144.32.168.77
@@ -839,6 +892,18 @@ 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
@@ -846,6 +911,25 @@ servers:
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
     contacts: faw
 
+  zemlinsky:
+    address: 129.143.160.6
+    parents: gw-karlsruhe
+    hostgroups: computers, buildd, hassrvfs, squeeze
+
+  zappa:
+    address: 148.100.96.103
+    parents: gw-marist
+    hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
+
+  sompek:
+    address: 217.196.146.208
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+  stadler:
+    address: 217.196.146.209
+    parents: gw-conova
+    hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc
+
 #############################
 # host groups
 #
@@ -868,6 +952,9 @@ hostgroups:
   freebsd:
     alias: freebsd
     private: 1
+  armhf:
+    alias: armhf
+    private: 1
   sparc:
     alias: sparc
     private: 1
@@ -926,6 +1013,8 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
+  wheezy:
+    alias: Hosts running wheezy
 
   lenny:
     alias: Hosts running lenny
@@ -1023,9 +1112,6 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
-  smart:
-    alias: hosts with smartd
-    private: 1
   hasbootfs:
     alias: hosts with a /boot filesystem
     private: 1
@@ -1044,9 +1130,9 @@ hostgroups:
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
-  hasvicepa:
-    alias: hosts with a /vicepa
-    private: 1
+#  hasvicepa:
+#    alias: hosts with a /vicepa
+#    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1117,17 +1203,24 @@ 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
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: klecker, kassia, spohr, liszt
+    excludehosts: kassia, spohr, liszt
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: klecker, kassia, spohr, liszt
+    hosts: kassia, spohr, liszt
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1169,11 +1262,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
     hostgroups: hashomefs
-  -
-    name: disk usage on /mnt/hdc
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
-    hosts: voltaire
   -
     name: disk usage on /x
     servicegroups: diskspace
@@ -1191,16 +1279,16 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
     hosts: busoni, wieck, heininen
 
-  -
-    name: disk usage on /srv/morgue.debian.org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
-    hosts: stabile
+  #-
+  #  name: disk usage on /srv/morgue.debian.org
+  #  servicegroups: diskspace
+  #  nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
+  #  hosts: stabile
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
-    hosts: stabile, beethoven, sibelius
+    hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
@@ -1209,58 +1297,58 @@ services:
   -
     name: disk usage on /srv/farm-snapshot/farm-01
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 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 85 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 85 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 85 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 85 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 85 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 85 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
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
     hosts: vivaldi
-  -
-    name: disk usage on /vicepa
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
-    hostgroups: hasvicepa
+#  -
+#    name: disk usage on /vicepa
+#    servicegroups: diskspace
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
+#    hostgroups: hasvicepa
   -
     name: disk usage on /var/lib/postgresql/9.0/dak
     servicegroups: diskspace
@@ -1284,6 +1372,7 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
+    excludehostgroups: wheezy
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1312,27 +1401,27 @@ services:
     retry_check_interval: 5
 
  ####
-  - name: afs - space
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
-  - name: afs - bos
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
-  - name: afs - waiting connections
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
+#  - name: afs - space
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
+#  - name: afs - bos
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
+#  - name: afs - waiting connections
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
   #- name: afs - udebug
   #  hostgroups: bosserver
   #  nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-udebug -H localhost"
@@ -1470,15 +1559,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
+    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
-    excludehosts: vasks, wagner
+  -
+    name: process - munin-node
+    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
@@ -1527,7 +1619,6 @@ services:
     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: freebsd
-    excludehosts: vasks, wagner
 
   -
     name: remote logging
@@ -1784,6 +1875,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
@@ -1808,7 +1900,7 @@ services:
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
     excludehosts: vasks, wagner
-    hostgroups: unbound-hosts, squeeze
+    hostgroups: unbound-hosts, squeeze, wheezy
  ###
   -
     name: process - uptimed
@@ -1886,13 +1978,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 - cpqarrayd
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehostgroups: squeeze
-    excludehosts: wagner
+    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
@@ -2010,7 +2100,6 @@ services:
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
     hostgroups: freebsd, sparc
-    excludehosts: vasks, wagner
 
  ###
   -
@@ -2033,11 +2122,11 @@ services:
     hostgroups: computers
     excludehostgroups: acpid-hosts, kvmdomains
  ###
-  -
-    name: process - bosserver
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
-    hostgroups: bosserver
-
+#  -
+#    name: process - bosserver
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
+#    hostgroups: bosserver
+#
  ###
   -
     name: process - inetd
@@ -2060,17 +2149,22 @@ 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
+    excludehosts: merikanto, rietz
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: merikanto2
+    depends: merikanto:process - xinetd
   #-
   #  name: network service - rsync
   #  check: check_tcp!873
@@ -2109,14 +2203,13 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: kassia
+    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
+    depends: klecker:process - apache2 - master
+    hosts: klecker-ftp
 
   # keyserver on kaufmann
   -
@@ -2168,24 +2261,23 @@ 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
+    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
+    excludehosts: klecker
   -
     name: network service - ftp
     check: check_ftp
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia
+    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
+    hosts: klecker-ftp
+    depends: klecker:process - xinetd
 
  ####
   -
@@ -2277,7 +2369,7 @@ services:
   -
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
-    hostgroups: squeeze
+    hostgroups: squeeze, wheezy
     excludehosts: fano, fasch, field, finzi
  ####
   -
@@ -2358,6 +2450,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
 
  ###
   #-
@@ -2370,10 +2468,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 ############
  ####
@@ -2479,10 +2573,6 @@ services:
     name: DNS SOA sync - a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
     hosts: global
-  -
-    name: DNS SOA sync - 2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa"
-    hosts: global
   -
     name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
@@ -2514,6 +2604,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