[project @ peter@palfrader.org-20090321015545-f50r351x408jgcol]
[mirror/dsa-nagios.git] / nagios-master.cfg
index 5a1d170..c07733e 100644 (file)
@@ -5,21 +5,16 @@
 # vim:set syntax=yaml:
 
 # TODO
-#  - raff:  identd, hpasmd
 #  - spohr: hpasmd
 #  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
 #  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
-#  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
-#  - puccini: mailgraph
-#  - lebrun: ippl
 
 # down:
 #  - sarti
-#  - goedel
 #  - leisner
 
 ---
@@ -99,6 +94,10 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: joerg
+  gw-1und1-karlsruhe:
+    address: 212.227.120.29
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
   gw-blackcat:
     address: 193.201.200.129
     parents: gw-HP-ftc
@@ -112,7 +111,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-utwente:
-    address: 130.89.160.1
+    address: 130.89.149.1
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   #gw-ughent:
@@ -124,7 +123,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-ubc:
-    address: 137.82.84.41
+    address: 137.82.84.94
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: lfilipoz
@@ -141,115 +140,153 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: holger
+  gw-telefonica:
+    address: 195.71.99.193
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-ball:
+    address: 78.32.9.209
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-cst:
+    address: 213.188.99.215
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-isc:
+    address: 149.20.20.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-aca:
+    address: 130.239.18.97
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+
+  global:
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
 
   samosa:
     address: 192.25.206.57
-    hostgroups: computers, service, dl380, apache2-hosts, bind9-hosts, heavy-exim
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet
   raff:
     address: 192.25.206.59
     parents: samosa
-    hostgroups: computers, service, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, puppet
   gluck:
     address: 192.25.206.10
     parents: samosa
-    hostgroups: computers, general, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, highload
+    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, puppet
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim
+    hostgroups: computers, general, apache1-hosts, apache2-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
   spohr:
     address: 192.25.206.33
     parents: samosa
-    hostgroups: computers, service, dl380, apache2-hosts, postgres81-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, puppet
   peri:
     address: 192.25.206.15
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: samosa
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, lenny, puppet
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, bind9-hosts
+    hostgroups: computers, porterbox, lenny, hasbootfs, puppet
   merulo:
     address: 192.25.206.58
     parents: samosa
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, lenny, puppet
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, syslog-ng-hosts, postfix-hosts, dl385, bind9-hosts
+    hostgroups: computers, service, dl385, bind9-hosts, lenny, puppet
     contacts: joerg, bzed
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu
+    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs
     contacts: bzed
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, puppet
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet
     contacts: bzed
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
     contacts: bzed
-  auber:
-    address: 82.195.75.101
+#  auber:
+#    address: 82.195.75.101
+#    parents: gw-man-da
+#    hostgroups: computers, no-udev, buildd, sw-raid
+#    contacts: bzed
+  unger:
+    address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid
-    contacts: bzed
+    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny, puppet
+  handel:
+    address: 82.195.75.104
+    parents: unger
+    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs, puppet
+
+  geo1:
+    address: 82.195.75.105
+    parents: unger
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, puppet
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny, puppet
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, postfix-hosts, dl380
+    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny, puppet
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-exim
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny, puppet
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd
+    hostgroups: computers, no-udev, buildd, hasbootfs
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd
+    hostgroups: computers, no-udev, buildd, hasbootfs
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, tftpd-hosts
+    hostgroups: computers, buildd, lenny, puppet, smart
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload
+    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -258,61 +295,73 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
 
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny, puppet
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, puppet
 
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres81-hosts, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny, puppet
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
 
   argento:
-    address: 195.49.152.174
+    address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet
+    contacts: bzed
+
+  widor:
+    address: 93.94.130.161
+    parents: gw-dg-i.net
+    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, puppet, rsyslog-hosts, acpid-hosts
     contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, porterbox, single-cpu
+    hostgroups: computers, no-udev, porterbox, single-cpu, no-samhain
 
   raptor:
     address: 195.243.109.162
     parents: gw-topalis
-    hostgroups: computers, porterbox, postfix-hosts
+    hostgroups: computers, porterbox, postfix-hosts, lenny
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid
+    # SMP kernel doesn't run stable
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, puppet
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
+    contacts: tjrc1
+  smetana:
+    address: 193.62.202.29
+    parents: gw-sanger
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet
     contacts: tjrc1
 
   verdi:
@@ -323,19 +372,37 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, puppet, lenny
     contacts: sfrost
 
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts
+    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, puppet
     contacts: joerg
+  powell:
+    address: 87.106.64.223
+    parents: gw-1und1
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet
+    contacts: joerg
+
+  schumann:
+    address: 212.227.126.54
+    parents: gw-1und1-karlsruhe
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny, puppet
+  wieck:
+    address: 195.20.242.89
+    parents: gw-1und1-karlsruhe
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet
+  chopin:
+    address: 195.20.242.124
+    parents: schumann
+    hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, bind9-hosts
+    hostgroups: computers, no-udev, buildd, sw-raid, lenny, puppet
 
   elara:
     address: 67.210.160.90
@@ -356,16 +423,32 @@ servers:
     parents: gw-nmmn
     hostgroups: deadslow
     contacts: luk
+  pescetti:
+    address: 217.114.76.85
+    parents: gw-nmmn
+    hostgroups: computers, porterbox, single-cpu, smart, lenny, puppet
 
   kassia:
-    address: 130.89.175.54
+    address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360
+    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, puppet
+  kassia-sec:
+    address: 130.89.149.225
+    parents: kassia
+    hostgroups: secondary-IPs
+  kassia-ftp:
+    address: 130.89.149.226
+    parents: kassia
+    hostgroups: secondary-IPs
+  kassia4:
+    address: 130.89.149.227
+    parents: kassia
+    hostgroups: secondary-IPs
 
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet
     contacts: luk
 
   agnesi:
@@ -374,31 +457,73 @@ servers:
     hostgroups: deadslow
 
   spontini:
-    address: 137.82.84.42
+    address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
     contacts: lfilipoz
   ravel:
-    address: 137.82.84.43
+    address: 137.82.84.66
+    parents: gw-ubc
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, puppet
+  dijkstra:
+    address: 137.82.84.70
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts
+    hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny, puppet
 
   lebrun:
-    address: 161.53.160.165
+    address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts
+  schroeder:
+    address: 193.198.184.11
+    parents: gw-carnet
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385
+    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, puppet
     contacts: holger
 
+  rem:
+    address: 195.71.99.217
+    parents: gw-telefonica
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+
+  ball:
+    address: 78.32.9.213
+    parents: gw-ball
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, puppet
+
+  zelenka:
+    address: 80.245.147.40
+    parents: gw-HP-ftc
+    hostgroups: computers, porterbox, lenny, puppet
+
+  escher:
+    address: 213.188.99.215
+    parents: gw-cst
+    hostgroups: computers, single-cpu, hasbootfs
+  goedel:
+    address: 213.188.99.214
+    parents: gw-cst
+    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet
+
+  schein:
+    address: 149.20.20.6
+    parents: gw-isc
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360
+
+  praetorius:
+    address: 130.239.18.121
+    parents: gw-aca
+    hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
+
 #############################
 # host groups
 #
@@ -413,8 +538,13 @@ hostgroups:
     alias: Internet routers and friends
     extinfo-icon_image: base/switch40.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
+  dialup:
+    alias: Systems with slow network
 
   porterbox:
     alias: developer accessible porter machines
@@ -436,6 +566,11 @@ hostgroups:
     extinfo-icon_image: base/debian.png
     extinfo-icon_image_alt: Debian GNU/Linux
     extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
+  puppet:
+    alias: Hosts running puppet
+    extinfo-icon_image: base/debian.png
+    extinfo-icon_image_alt: Debian GNU/Linux
+    extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
 
   dl380:
     alias: HP DL380 hosts
@@ -446,6 +581,9 @@ hostgroups:
   dl360:
     alias: HP DL360 hosts
     private: 1
+  bl460:
+    alias: HP BL460 blades
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -457,9 +595,13 @@ hostgroups:
     alias: Hosts running lenny, not etch
     private: 1
 
-  syslog-ng-hosts:
-    alias: hosts running syslog-ng instead of sysklogd
+  no-samhain:
+    alias: hosts not running samhain properly
     private: 1
+
+  #syslog-ng-hosts:
+  #  alias: hosts running syslog-ng instead of sysklogd
+  #  private: 1
   rsyslog-hosts:
     alias: hosts running rsyslogd instead of sysklogd
     private: 1
@@ -467,7 +609,7 @@ hostgroups:
     alias: hosts running postfix instead of exim
     private: 1
   heavy-exim:
-    alias: "hosts running the full mail stuff, including clamav, SA, and greylistd"
+    alias: "hosts running the full mail stuff, including clamav, SA, and postgrey"
     private: 1
   heavy-postfix:
     alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"
@@ -487,18 +629,37 @@ hostgroups:
   ftpd-hosts:
     alias: hosts running vsftpd
     private: 1
-  tftpd-hosts:
-    alias: hosts running a tftpd (tftpd-hpa as a daemon)
-    private: 1
+  #tftpd-hosts:
+  #  alias: hosts running a tftpd (tftpd-hpa as a daemon)
+  #  private: 1
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
   postgres81-hosts:
     alias: hosts running postgres81
     private: 1
+  postgres83-hosts:
+    alias: hosts running postgres83
+    private: 1
   mysql-hosts:
     alias: hosts running mysql
     private: 1
+  no-udev:
+    alias: hosts not using udev
+    private: 1
+  ulogd-hosts:
+    alias: hosts running ulogd
+    private: 1
+  acpid-hosts:
+    alias: hosts running acpid
+    private: 1
+
+  nfs-client:
+    alias: hosts mounting filesystems using NFS
+    private: 1
+  nfs-server:
+    alias: hosts serving filesystems using NFS
+    private: 1
 
   highload:
     alias: "hosts on which high load is normal"
@@ -508,6 +669,13 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
+  smart:
+    alias: hosts with smartd
+    private: 1
+  hasbootfs:
+    alias: hosts with a /boot
+    private: 1
+
 
 #############################
 # servicegroups
@@ -525,9 +693,11 @@ servicegroups:
     alias: weak ssh keys
   apt:
     alias: apt upgrade status
+  samhain:
+    alias: samhain integrity status
   security:
     alias: security
-    servicegroup_members: apt, weaksshkeys, kernel
+    servicegroup_members: apt, weaksshkeys, kernel, samhain
 
 #############################
 # services
@@ -536,15 +706,15 @@ services:
   -
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
-    hostgroups: all
-    excludehostgroups: routing-infrastructure
+    hostgroups: pingable
+    excludehostgroups: routing-infrastructure, dialup
     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: routing-infrastructure, dialup
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -557,34 +727,34 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc 90 95"
     hostgroups: computers
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries
+    excludehosts: ries, klecker
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
-    hosts: ries
+    hosts: ries, klecker
   -
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, auber
+    hostgroups: hasbootfs
   -
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, puccini, lebrun, tartini, morales
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, tartini, morales, powell, escher
   -
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel, mahler
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -594,7 +764,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales, auber
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka, chopin
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -604,17 +774,17 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini
+    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo, tartini, morales
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, merulo, tartini, morales, powell
   -
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun
+    hosts: raptor, voltaire, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -658,6 +828,13 @@ services:
     normal_check_interval: 180
     max_check_attempts: 2
     retry_check_interval: 5
+  -
+    name: backup server config
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
+    hosts: bartok
+    normal_check_interval: 180
+    max_check_attempts: 2
+    retry_check_interval: 5
 
  ####
   -
@@ -668,6 +845,33 @@ services:
     normal_check_interval: 180
     retry_check_interval: 5
 
+ ####
+  -
+    name: process - puppet
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C ruby -a 'ruby /usr/sbin/puppetd -w 5 --factsync'"
+    hostgroups: puppet
+
+  -
+    name: puppet
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-puppet"
+    hostgroups: puppet
+
+ ####
+  -
+    name: process - samhain
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
+    hostgroups: computers
+    excludehostgroups: no-samhain
+  -
+    name: samhain
+    servicegroups: samhain
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
+    hostgroups: computers
+    excludehostgroups: no-samhain
+    depends: process - samhain
+    normal_check_interval: 60
+    retry_check_interval: 5
+
  ####
   -
     name: users
@@ -713,6 +917,7 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
+    excludehosts: zelenka
  ####
   -
     name: process - sshd
@@ -745,37 +950,37 @@ services:
 
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd
     hostgroups: computers, deadslow
     excludehosts: agnesi, crest, kullervo
     excludehostgroups: lenny
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1"
     depends: network service - sshd
     hosts: crest, kullervo
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-2"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version - 2260"
-    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch2"
+    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd - 2260
     hosts: agnesi
-    normal_check_interval:  360
+    normal_check_interval:  60
  #
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
     hostgroups: computers
-    normal_check_interval:  360
+    normal_check_interval:  60
  ####
   -
     name: network service - nrpe
@@ -806,18 +1011,18 @@ services:
     # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
-    excludehosts: raptor
+    excludehosts: raptor, zelenka
   -
     name: network service - ntp
     check: check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: raptor, allegri
+    excludehosts: raptor, allegri, zelenka
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: raptor, allegri
+    hosts: raptor, allegri, zelenka
     depends: process - xinetd
 
  ###
@@ -832,10 +1037,10 @@ services:
     hostgroups: computers
 
  ###
-  -
-    name: process - syslog-ng
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: syslog-ng-hosts
# -
#   name: process - syslog-ng
#   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
#   hostgroups: syslog-ng-hosts
  ###
   -
     name: process - rsyslogd
@@ -846,12 +1051,12 @@ services:
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
+    excludehostgroups: rsyslog-hosts
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
+    excludehostgroups: rsyslog-hosts
 
  ### MAIL STUFF
  ###
@@ -860,17 +1065,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, gluck
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, gluck
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz, merkel
+    hosts: master, rietz, merkel, gluck
  ###
   -
     name: process - clamav - clamd
@@ -944,18 +1149,21 @@ services:
     hosts: merkel, raff
 
  ###
-  -
-    name: process - greylistd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
-    hostgroups: heavy-exim
+  #-
+  #  name: process - greylistd
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
+  #  hostgroups: heavy-exim
   #
   -
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
-    excludehostgroups: heavy-exim
 
  ###
+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
+    hostgroups: heavy-exim
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
@@ -965,7 +1173,7 @@ services:
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers
-    excludehostgroups: heavy-postfix
+    excludehostgroups: heavy-postfix, heavy-exim
  ###
   -
     name: process - amavis - master
@@ -1099,7 +1307,7 @@ services:
   -
     name: network service - smtp - port 8080
     check: dsa_check_smtp_port!8080
-    hosts: murphy, piatti
+    hosts: murphy
     depends: process - postfix - master
   -
     name: network service - smtp - port 2025
@@ -1117,8 +1325,8 @@ services:
 
 
   -
-    name: setup - debian-admin in etc aliases
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-da-in-aliases"
+    name: setup - dsa config
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
     normal_check_interval: 120
   -
@@ -1159,10 +1367,12 @@ services:
     name: unwanted process - portmap
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
     hostgroups: computers
+    excludehostgroups: nfs-client, nfs-server
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: computers
+    excludehostgroups: nfs-client, nfs-server
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
@@ -1171,7 +1381,6 @@ services:
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
-    excludehosts: lobos, villa
 
 
  ############ Processes/Services that only run on some computers ############
@@ -1181,12 +1390,6 @@ services:
     name: process - rngd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd  -a '/usr/sbin/rngd -r /dev/hwrng'"
     hostgroups: dl385
- ###
-  -
-    name: process - sensord
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C sensord  -a '/usr/sbin/sensord -f daemon'"
-    hosts: bartok
-
  ###
   -
     name: process - mdadm monitor
@@ -1204,18 +1407,24 @@ services:
     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
+    hostgroups: dl385, dl380, dl360, bl460
   -
     name: RAID - arrayprobe
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360
+    hostgroups: dl385, dl380, dl360, bl460
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360
+    hostgroups: dl385, dl380, dl360, bl460
+ ###
+  -
+    name: RAID - areca
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
+    hosts: powell
  ###
   -
     name: RAID - DAC960
@@ -1240,28 +1449,48 @@ services:
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
     hosts: samosa
+ ###
+  -
+    name: process - ulogd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
+    hostgroups: ulogd-hosts
+  -
+    name: unexpected process - ulogd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
+    hostgroups: computers
+    excludehostgroups: ulogd-hosts
  ###
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
-    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, verdi, liszt, kassia, agricola, arcadelt, argento, allegri, morales, bartok
+    hostgroups: computers
+    excludehostgroups: no-udev
+  -
+    name: unexpected process - udev
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
+    hostgroups: no-udev
  ###
   -
     name: process - acpid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid -c /etc/acpi/events -s /var/run/acpid.socket'"
-    hosts: ries, steffani, liszt, kassia
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid'"
+    hostgroups: acpid-hosts
+  -
+    name: unexpected process - acpid
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
+    hostgroups: computers
+    excludehostgroups: acpid-hosts
 
  ###
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, raptor, allegri
+    hosts: samosa, raptor, allegri, gluck, zelenka
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor, allegri
+    excludehosts: samosa, raptor, allegri, gluck, zelenka
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1282,6 +1511,12 @@ services:
     hosts: rietz2
     depends: rietz:process - xinetd
 
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: kassia-sec
+    depends: kassia:process - xinetd
+
  ###
   -
     name: process - nagios3
@@ -1303,8 +1538,13 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
+    excludehosts: kassia
     depends: process - apache2 - master
-
+  -
+    name: network service - http
+    check: check_http
+    depends: kassia:process - apache2 - master
+    hosts: kassia-sec, kassia-ftp
 
 
   -
@@ -1326,20 +1566,20 @@ services:
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
-    depends: process - apache - master
+    depends: process - apache2 - master
 
   -
     name: network service - https
     check: check_https
-    hosts: samosa
+    hosts: samosa, ries, klecker
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa
+    hosts: samosa, ries, klecker
     depends: network service - https
-    normal_check_interval: 240
+    normal_check_interval: 60
  ####
   -
     name: process - named
@@ -1361,21 +1601,29 @@ 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
+    excludehosts: kassia
   -
     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
+    excludehosts: kassia
   -
     name: network service - ftp
     check: check_ftp
     hostgroups: ftpd-hosts
+    excludehosts: kassia
     depends: process - vsftp - listener
+  -
+    name: network service - ftp
+    check: check_ftp
+    hosts: kassia-sec, kassia-ftp
+    depends: kassia:process - xinetd
 
  ####
   -
     name: process - debianqueued
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
-    hosts: ries
+    hosts: ries, ravel, klecker
 
  ###
   -
@@ -1397,6 +1645,24 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats collector process'"
     hostgroups: postgres81-hosts
     depends: process - postresql81 - master
+ ####
+  -
+    name: process - postresql83 - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
+    hostgroups: postgres83-hosts
+    excludehosts: piatti, klecker
+  -
+    name: process - postresql83 - master udd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
+    hosts: piatti
+  -
+    name: process - postresql83 - dak master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
+    hosts: ries, klecker
+  -
+    name: process - postresql83 - dak-dev master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak-dev -c config_file=/etc/postgresql/8.3/dak-dev/postgresql.conf'"
+    hosts: ries
  ####
   -
     name: process - mysql - master
@@ -1408,6 +1674,16 @@ services:
     hostgroups: mysql-hosts
     depends: process - mysql - master
 
+ ####
+  -
+    name: process - stunnel4 - postgres-udd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
+    hosts: piatti
+  -
+    name: process - stunnel4 - postgres-udd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
+    hosts: merkel, master
+
  ####
   #-
   #  name: process - xenconsoled
@@ -1423,11 +1699,10 @@ services:
   #  hosts: piatti
 #
  ####
-  # XXX is this needed?
   -
-    name: process - snmpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u snmp -C snmpd -a '/usr/sbin/snmpd -Lsd -Lf /dev/null -u snmp -I -smux -p /var/run/snmpd.pid 127.0.0.1'"
-    hosts: lobos, villa
+    name: process - libvirtd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C libvirtd -a '/usr/sbin/libvirtd -d'"
+    hosts: unger
 
  ###
   -
@@ -1435,6 +1710,7 @@ services:
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
     hostgroups: buildd
+    contacts: luk
 
  ###
   -
@@ -1443,17 +1719,93 @@ services:
     hosts: raptor
 
  ###
-  -
-    name: process - tftpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
-    hostgroups: tftpd-hosts
+  #-
+  #  name: process - tftpd
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
+  #  hostgroups: tftpd-hosts
  ###
-  -
-    name: process - dhcpd
-    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 - dhcpd
+#    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 - monit
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C monit -a '/usr/sbin/monit -d 30 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hosts: villa, lobos, steffani, kassia, master
+    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 ############
+ ####
+  -
+    name: process - portmap
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C portmap -a '/sbin/portmap'"
+    hostgroups: nfs-client, nfs-server
+  -
+    name: process - statd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"
+    hostgroups: nfs-client, nfs-server
+  -
+    name: process - nfsd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C nfsd -a '[nfsd]'"
+    hostgroups: nfs-server
+  -
+    name: process - lockd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C lockd -a '[lockd]'"
+    hostgroups: nfs-server
+  -
+    name: process - mountd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rpc.mountd -a '/sbin/rpc.mountd'"
+    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 /home/org/ftp.root/debian"
+    hosts: gluck
+  -
+    name: nfs mount ftp archive
+    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
+    hosts: merkel, raff
+
+ ############ MISC OTHER Stuff ############
+ #####
+  -
+    name: mirror sync - security
+    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - security.eu
+    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - security.us
+    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: DNS SOA sync - debprivate-ftcollins.debian.org
+    check: "dsa_check_soas!debprivate-ftcollins.debian.org"
+    hosts: global
+  -
+    name: DNS SOA sync - debian.org
+    check: "dsa_check_soas_add!samosa.debian.org!debian.org"
+    hosts: global
+  -
+    name: DNS SOA sync - debian.net
+    check: "dsa_check_soas_add!samosa.debian.org!debian.net"
+    hosts: global
+  -
+    name: DNS SOA sync - debian.com
+    check: "dsa_check_soas_add!samosa.debian.org!debian.com"
+    hosts: global
+  -
+    name: DNS SOA sync - mirror.debian.net
+    check: "dsa_check_soas_add!samosa.debian.org!mirror.debian.net"
+    hosts: global
+  -
+    name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
+    check: "dsa_check_soas_add!samosa.debian.org!144-28.118.59.86.in-addr.arpa"
+    hosts: global
+  -
+    name: DNS SOA sync - alioth.debian.org
+    check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
+    hosts: global