X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=7b6a7c6f397ce4b7065ffc6a8fcef868cabb26e4;hb=4f9cb0325e741fa0125e820258dda301eda84c16;hp=07214e52c477d65cea8bd401b02c1eefdaf91d08;hpb=444d80979ec4c7c5c2edc2ee25f942e45506161a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 07214e5..7b6a7c6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -56,7 +56,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-mit-csail:
-    address: 128.30.0.254
+    address: 128.31.0.1
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-xs4all:
@@ -131,6 +131,11 @@ servers:
     address: 82.94.249.153
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-telegraaf2:
+    address: 217.196.40.15
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
+    contact_groups: +alioth-admins
   gw-helsinki:
     address: 128.214.173.25
     parents: gw-ubc
@@ -181,32 +186,40 @@ servers:
     address: 200.17.202.254
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-zivit:
+    address: 80.245.144.3
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
 
+  vasks:
+    address: 217.196.43.140
+    parents: gw-telegraaf2
+    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
+    contact_groups: alioth-admins
+
+  wagner:
+    address: 217.196.43.132
+    parents: gw-telegraaf2
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
+    contact_groups: alioth-admins
+
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, xinetd-hosts, apache2-hosts, squeeze
+    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
-#  merkel:
-#    address: 192.25.206.16
-#    parents: gw-HP-ftc
-#    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts, lenny
-#  merkel2:
-#    address: 192.25.206.71
-#    parents: merkel
-#    hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, unbound-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -220,7 +233,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, lenny
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze, brokensamhain
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -232,22 +245,22 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts, squeeze
+    hostgroups: computers, buildd, acpid-hosts, squeeze, brokensamhain
 
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, lenny
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, squeeze
     contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, lenny
+    hostgroups: computers, porterbox, sw-raid, hassrvfs, squeeze
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -257,7 +270,7 @@ servers:
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze
+    hostgroups: computers, acpid-hosts, service, squeeze, megactl
   nielsen:
     address: 82.195.75.99
     parents: gw-man-da
@@ -269,7 +282,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, lenny
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze
   geo1:
     address: 82.195.75.105
     parents: unger
@@ -277,7 +290,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, lenny
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -306,7 +319,7 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, unbound-hosts, squeeze
+    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -334,7 +347,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -402,7 +415,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, unbound-hosts, squeeze
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
     contacts: bzed
 
   pergolesi:
@@ -469,7 +482,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, lenny
+    hostgroups: computers, buildd, sw-raid, squeeze
 
   pescetti:
     address: 217.114.76.85
@@ -507,7 +520,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, lenny, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -547,7 +560,7 @@ servers:
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts, squeeze, autofs
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
@@ -559,7 +572,7 @@ servers:
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
@@ -567,7 +580,7 @@ servers:
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -623,7 +636,7 @@ servers:
   quantz:
     address: 206.12.19.122
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
     parents: salieri
@@ -639,16 +652,36 @@ servers:
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
+  dukas:
+    address: 206.12.19.128
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+  tye:
+    address: 206.12.19.129
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+  elgar:
+    address: 206.12.19.130
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  berlioz:
+    address: 206.12.19.131
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
+  gombert:
+    address: 206.12.19.132
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, lenny
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
 
   tartini:
     address: 82.94.249.158
@@ -668,12 +701,12 @@ servers:
 
   zelenka:
     address: 80.245.147.40
-    parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts, squeeze
+    parents: gw-zivit
+    hostgroups: computers, porterbox, hassrvfs, squeeze
   zandonai:
     address: 80.245.147.46
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, lenny
+    parents: gw-zivit
+    hostgroups: computers, buildd, hassrvfs, squeeze, brokensamhain
 
   goedel:
     address: 213.188.99.214
@@ -692,7 +725,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze, autofs
 
 #  lafayette:
 #    address: 147.215.7.160
@@ -757,7 +790,7 @@ servers:
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs, apache2-hosts
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -765,34 +798,34 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs, megactl
     # which raid?
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze
+    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
     # which raid?
 
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   arne:
     address: 217.140.96.61
     parents: gw-arm
@@ -801,11 +834,11 @@ servers:
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
 
   santoro:
     address: 200.17.202.197
@@ -881,6 +914,9 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
+  megactl:
+    alias: Hosts with LSI Logic MegaRAID, but not usable with megaraid check
+    private: 1
   megaraid:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
@@ -975,6 +1011,9 @@ hostgroups:
   nfs-server:
     alias: hosts serving filesystems using NFS
     private: 1
+  autofs:
+    alias: hosts running the automounter
+    private: 1
 
   highload:
     alias: "hosts on which high load is normal"
@@ -1022,6 +1061,10 @@ hostgroups:
     alias: "hosts who's ntp offset is often unknown"
     private: 1
 
+  brokensamhain:
+    alias: machines that can not run samhain
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -1100,11 +1143,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-#  -
-#    name: disk usage on /org
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-#    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -1116,11 +1154,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hosts: ries
-#  -
-#    name: disk usage on /org/scratch
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
-#    hosts: merkel
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1199,14 +1232,24 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-89"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-abf
+    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"
+    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"
+    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-abf"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-f"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-cde
+    name: disk usage on /srv/farm-snapshot/farm-e
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-e"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
@@ -1302,6 +1345,7 @@ services:
     name: puppet
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: computers
+    excludehosts: wagner, vasks
 
  ####
   -
@@ -1309,17 +1353,20 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
     hostgroups: computers
     excludehostgroups: freebsd
+    excludehosts: vasks, wagner
   -
     name: puppetized firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
     hostgroups: computers
     excludehostgroups: freebsd
+    excludehosts: vasks, wagner
 
  ####
   -
     name: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
+    excludehostgroups: brokensamhain
   -
     name: samhain
     servicegroups: samhain
@@ -1328,6 +1375,7 @@ services:
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
+    excludehostgroups: brokensamhain
 
  ####
   -
@@ -1404,6 +1452,7 @@ services:
     servicegroups: weaksshkeys
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
     hostgroups: computers
+    excludehosts: wagner, vasks
     normal_check_interval:  60
  ####
   -
@@ -1424,33 +1473,35 @@ services:
     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: freebsd
+    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'"
     hostgroups: freebsd
+    excludehosts: vasks, wagner
   -
     name: network service - munin-node
     check: check_tcp!4949
     hostgroups: computers
     depends: process - munin-node
+    excludehosts: vasks, wagner
  ###
   -
     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
-    excludehosts: zelenka
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: zelenka, ancina
+    excludehosts: ancina
     excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: zelenka, ancina
+    hosts: ancina
     depends: process - xinetd
 
  ###
@@ -1470,17 +1521,20 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
     excludehostgroups: freebsd
+    excludehosts: vasks, wagner
 
   -
     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
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: heininen
     hostgroups: computers
+    excludehosts: vasks, wagner
  ### MAIL STUFF
  ###
   -
@@ -1512,34 +1566,39 @@ services:
     name: process - clamav - clamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u clamav -C clamd -a '/usr/sbin/clamd'"
     hostgroups: heavy-exim, heavy-postfix
+    hosts: wagner
   -
     name: service - clamav
     nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl"
     hostgroups: heavy-exim, heavy-postfix
+    hosts: wagner
     depends: process - clamav - clamd
   -
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
+    hosts: wagner
     hostgroups: heavy-exim, heavy-postfix
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+    excludehosts: wagner
   -
     name: unwanted process - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+    excludehosts: wagner
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
-    excludehosts: powell
+    excludehosts: powell, wagner
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: powell
+    hosts: powell, wagner
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1547,7 +1606,7 @@ services:
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-    hosts: liszt
+    hosts: liszt, wagner
     hostgroups: spamd
     depends: process - spamd - master
   #
@@ -1565,7 +1624,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, busoni
+    excludehosts: liszt, busoni, wagner
 
  ###
   #-
@@ -1729,28 +1788,33 @@ services:
   -
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
+    excludehosts: wagner, vasks
     hostgroups: computers
   -
     name: system - available entropy
     nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
     event_handler: dsa_event_handler_restart_ekey
     hostgroups: computers
+    excludehosts: vasks, wagner
     excludehostgroups: freebsd
  ###
   -
     name: local resolver
     nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
     hostgroups: computers
+    excludehosts: vasks, wagner
     normal_check_interval: 60
   -
     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
  ###
   -
     name: process - uptimed
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
+    excludehosts: vasks, wagner
  ###
   -
     name: unwanted process - irqbalance
@@ -1785,7 +1849,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd
+    excludehosts: grieg, byrd, abel, alwyn, vasks
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1821,12 +1885,14 @@ 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 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
+    excludehosts: vasks, wagner
   -
     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: RAID - arrayprobe
     servicegroups: raid
@@ -1844,6 +1910,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: kassia
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -1856,6 +1923,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:2 --ignore-transfer-speed=1I:1:3 --ignore-transfer-speed=1I:1:4 --ignore-transfer-speed=2I:1:5 --ignore-transfer-speed=2I:1:6"
+    normal_check_interval: 120
+    hosts: kassia
  ###
   -
     name: HW - hpasmcli status
@@ -1909,6 +1982,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-mpt"
     hostgroups: mptraid
 
+ ###
+  -
+    name: RAID - megactl
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
+    hostgroups: megactl
  ###
   -
     name: process - slapd
@@ -1926,10 +2005,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
     hostgroups: computers
     excludehostgroups: freebsd, sparc
+    excludehosts: vasks, wagner
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
     hostgroups: freebsd, sparc
+    excludehosts: vasks, wagner
 
  ###
   -
@@ -1961,7 +2042,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
+    hosts: grieg, byrd, vasks
  ###
   -
     name: process - xinetd
@@ -2238,6 +2319,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
     hosts: franck
     depends: process - UPS - nut upsd
+  -
+    name: process - pglistener
+    nrpe: "/usr/lib/nagios/plugins/check_procs -u pglisten -C python -a '/usr/bin/python /usr/share/pglistener/starter.py /etc/pglistener/pglistener.cfg /etc/pglistener/conf.d' -w 1: -c 1:"
+    hosts: wagner, vasks
 
  ####
   #-
@@ -2265,15 +2350,14 @@ services:
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
     hosts: fano, fasch, field, finzi
-    contacts: luk, pkern, HE
-
+    contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
-    contacts: luk, pkern, HE
+    contact_groups: buildd
 
  ###
   #-
@@ -2315,10 +2399,6 @@ services:
     hostgroups: nfs-server
  # see if the nfs stuff works and doesn't hang.
   # the df check all script will also hang, but we don't appear to pay attention to that
-#  -
-#    name: nfs mount ftp archive
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-#    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
@@ -2328,6 +2408,16 @@ services:
     name: nfs server stabile reachable
     nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
     hosts: quantz
+  #
+  -
+    name: process - automount
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C automount -a '/usr/sbin/automount'"
+    hostgroups: autofs
+  -
+    name: unwanted process - automount
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C automount"
+    hostgroups: computers
+    excludehostgroups: autofs
 
  ############ MISC OTHER Stuff ############
  #####