[project @ peter@palfrader.org-20090201125442-69y1hh6cyrgixpoy]
[mirror/dsa-nagios.git] / nagios-master.cfg
index 4e42be6..0c6d1bf 100644 (file)
 #  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
-#  - puccini: mailgraph
-#  - lebrun: ippl
 
 # down:
 #  - sarti
-#  - goedel
 #  - leisner
 
 ---
@@ -86,10 +83,6 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: tjrc1
-  gw-cst:
-    address: 213.188.99.215
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-lrz:
     address: 129.187.0.150
     parents: gw-HP-ftc
@@ -103,6 +96,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
@@ -116,7 +113,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:
@@ -128,7 +125,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
@@ -145,26 +142,43 @@ 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
+
+  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
   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
   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
   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
   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
   peri:
     address: 192.25.206.15
     parents: samosa
@@ -178,15 +192,15 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: samosa
-    hostgroups: computers, buildd
+    hostgroups: computers, no-udev, buildd
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, bind9-hosts
+    hostgroups: computers, porterbox, lenny
   merulo:
     address: 192.25.206.58
     parents: samosa
-    hostgroups: computers, porterbox
+    hostgroups: computers, no-udev, porterbox
 
   bartok:
     address: 82.195.75.91
@@ -196,7 +210,7 @@ servers:
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu
+    hostgroups: computers, porterbox, single-cpu, no-samhain
     contacts: bzed
   sperger:
     address: 82.195.75.98
@@ -206,41 +220,46 @@ servers:
   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, no-samhain
     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, no-samhain
     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
+#    parents: gw-man-da
+#    hostgroups: computers, no-udev, buildd, sw-raid
+#    contacts: bzed
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload
+    hostgroups: computers, no-udev, general, apache2-hosts, bind9-hosts, heavy-exim, highload
   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
 
   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, postgres81-hosts, heavy-exim, acpid-hosts
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd
+    hostgroups: computers, no-udev, buildd
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd
+    hostgroups: computers, no-udev, buildd
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
@@ -248,7 +267,7 @@ servers:
   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
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -266,11 +285,11 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid
-  casals:
-    address: 128.31.0.16
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts
+  mahler:
+    address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: deadslow
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
 
   klecker:
     address: 194.109.137.218
@@ -280,22 +299,22 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
+    hostgroups: computers, no-udev, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
 
   argento:
     address: 195.49.152.174
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
     contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, no-udev, porterbox, sw-raid
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, porterbox, single-cpu
+    hostgroups: computers, no-udev, porterbox, single-cpu
 
   raptor:
     address: 195.243.109.162
@@ -305,18 +324,20 @@ servers:
   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
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, buildd, sw-raid
+    # SMP kernel doesn't run stable
+    hostgroups: computers, buildd, sw-raid, single-cpu
+    contacts: tjrc1
+  smetana:
+    address: 193.62.202.29
+    parents: gw-sanger
+    hostgroups: computers, porterbox, sw-raid
     contacts: tjrc1
-
-  escher:
-    address: 213.188.99.215
-    parents: gw-cst
-    hostgroups: computers, porterbox, single-cpu
 
   verdi:
     address: 192.54.42.193
@@ -332,13 +353,27 @@ servers:
   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
+    contacts: joerg
+  powell:
+    address: 87.106.64.223
+    parents: gw-1und1
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts
     contacts: joerg
 
+  schumann:
+    address: 212.227.126.54
+    parents: gw-1und1-karlsruhe
+    hostgroups: computers, acpid-hosts, ulogd-hosts
+  wieck:
+    address: 195.20.242.89
+    parents: gw-1und1-karlsruhe
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts
+
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, bind9-hosts
+    hostgroups: computers, no-udev, buildd, sw-raid, bind9-hosts
 
   elara:
     address: 67.210.160.90
@@ -359,16 +394,32 @@ servers:
     parents: gw-nmmn
     hostgroups: deadslow
     contacts: luk
+  pescetti:
+    address: 217.114.76.85
+    parents: gw-nmmn
+    hostgroups: computers, porterbox, single-cpu, smart
 
   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
+  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, no-samhain
     contacts: luk
 
   agnesi:
@@ -377,19 +428,23 @@ servers:
     hostgroups: deadslow
 
   spontini:
-    address: 137.82.84.42
+    address: 137.82.84.65
     parents: gw-ubc
     hostgroups: computers, buildd
     contacts: lfilipoz
   ravel:
-    address: 137.82.84.43
+    address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts
 
   lebrun:
-    address: 161.53.160.165
+    address: 193.198.184.10
     parents: gw-carnet
     hostgroups: computers, buildd
+  schroeder:
+    address: 193.198.184.11
+    parents: gw-carnet
+    hostgroups: computers, buildd, sw-raid
 
   tartini:
     address: 82.94.249.158
@@ -399,9 +454,33 @@ servers:
   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
     contacts: holger
 
+  rem:
+    address: 195.71.99.217
+    parents: gw-telefonica
+    hostgroups: computers, buildd
+
+  ball:
+    address: 78.32.9.213
+    parents: gw-ball
+    hostgroups: computers, buildd, no-udev, dialup
+
+  zelenka:
+    address: 80.245.147.40
+    parents: gw-HP-ftc
+    hostgroups: computers, porterbox, lenny
+
+  escher:
+    address: 213.188.99.215
+    parents: gw-cst
+    hostgroups: computers, single-cpu
+  goedel:
+    address: 213.188.99.214
+    parents: gw-cst
+    hostgroups: computers, single-cpu
+
 #############################
 # host groups
 #
@@ -416,8 +495,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
@@ -460,14 +544,21 @@ hostgroups:
     alias: Hosts running lenny, not etch
     private: 1
 
+  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
   postfix-hosts:
     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"
@@ -496,9 +587,28 @@ hostgroups:
   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 +618,10 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
+  smart:
+    alias: hosts with smartd
+    private: 1
+
 
 #############################
 # servicegroups
@@ -525,9 +639,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 +652,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
@@ -574,17 +690,17 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball, goedel, escher
   -
     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, escher, voltaire, puccini, lebrun, tartini, morales
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, 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
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -594,7 +710,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
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -604,17 +720,17 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, escher, 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, escher, voltaire, lebrun
+    hosts: raptor, voltaire, lebrun, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -648,7 +764,8 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    normal_check_interval:  360
+    normal_check_interval:  60
+    retry_check_interval: 15
  ####
   -
     name: backup
@@ -657,6 +774,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
 
  ####
   -
@@ -667,6 +791,22 @@ services:
     normal_check_interval: 180
     retry_check_interval: 5
 
+ ####
+  -
+    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-samhain -t 45"
+    hostgroups: computers
+    excludehostgroups: no-samhain
+    depends: process - samhain
+    normal_check_interval: 240
+    retry_check_interval: 5
+
  ####
   -
     name: users
@@ -712,6 +852,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
@@ -744,7 +885,7 @@ 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
@@ -758,13 +899,13 @@ services:
     normal_check_interval:  360
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.7p1 Debian-12"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
     normal_check_interval:  360
   -
     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
@@ -805,18 +946,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
 
  ###
@@ -835,17 +976,22 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: syslog-ng-hosts
+ ###
+  -
+    name: process - rsyslogd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
+    hostgroups: rsyslog-hosts
  ###
   -
     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
+    excludehostgroups: syslog-ng-hosts, 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
+    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
 
  ### MAIL STUFF
  ###
@@ -879,6 +1025,10 @@ services:
     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'"
     hostgroups: heavy-exim, heavy-postfix
+  -
+    name: process - clamav - getsigs
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C getclamsigs -a 'getclamsigs'"
+    hostgroups: heavy-exim, heavy-postfix
   #
   -
     name: unwanted process - clamav
@@ -890,6 +1040,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+  -
+    name: unwanted process - clamav - getsigs
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C getclamsigs"
+    hostgroups: computers
+    excludehostgroups: heavy-exim, heavy-postfix
  ###
   -
     name: process - spamd - master
@@ -929,18 +1084,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'"
@@ -950,7 +1108,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
@@ -1084,7 +1242,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
@@ -1102,8 +1260,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
   -
@@ -1144,10 +1302,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"
@@ -1165,7 +1325,7 @@ 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'"
-    hosts: bartok
+    hostgroups: dl385
  ###
   -
     name: process - sensord
@@ -1199,7 +1359,14 @@ services:
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    normal_check_interval: 120
     hostgroups: dl385, dl380, dl360
+ ###
+  -
+    name: RAID - areca
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
+    hosts: powell
  ###
   -
     name: RAID - DAC960
@@ -1224,28 +1391,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, escher, verdi, liszt, kassia, agricola, arcadelt, argento, allegri, morales
+    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
  ###
   -
@@ -1266,6 +1453,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
@@ -1287,8 +1480,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
 
 
   -
@@ -1310,18 +1508,18 @@ 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
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa
+    hosts: samosa, ries
     depends: network service - https
     normal_check_interval: 240
  ####
@@ -1345,21 +1543,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
 
  ###
   -
@@ -1381,6 +1587,36 @@ 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
+  -
+    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/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
+    hosts: piatti
+  -
+    name: process - postresql83 - writer
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: writer process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - wal writer
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: wal writer process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - autovacuum launcher
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: autovacuum launcher process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
+  -
+    name: process - postresql83 - stats collector
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: stats collector process'"
+    hostgroups: postgres83-hosts
+    depends: process - postresql83 - master
  ####
   -
     name: process - mysql - master
@@ -1394,18 +1630,28 @@ services:
 
  ####
   -
-    name: process - xenconsoled
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenconsoled -a 'xenconsoled'"
+    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 - xenstored
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenstored -a '/usr/lib/xen-3.0.3-1/bin/xenstored --pid-file /var/run/xenstore.pid'"
-    hosts: piatti
-  -
-    name: process - xend
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
-    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
 
+ ####
+  #-
+  #  name: process - xenconsoled
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenconsoled -a 'xenconsoled'"
+  #  hosts: piatti
+  #-
+  #  name: process - xenstored
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenstored -a '/usr/lib/xen-3.0.3-1/bin/xenstored --pid-file /var/run/xenstore.pid'"
+  #  hosts: piatti
+  #-
+  #  name: process - xend
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
+  #  hosts: piatti
+#
  ####
   # XXX is this needed?
   -
@@ -1419,6 +1665,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
 
  ###
   -
@@ -1432,12 +1679,93 @@ services:
     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