X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=56e5145ddb85f6bb419980c13da3114e9cfaae32;hb=a06c2424a36c359710c328b2d27760725e36b66b;hp=25d68546a7156527cc480ea26dcb46ed79ecabad;hpb=8be50968407c5a5450119088237bd1e79dee7257;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 25d6854..56e5145 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -17,7 +17,6 @@
 
 # down:
 #  - sarti
-#  - goedel
 #  - leisner
 
 ---
@@ -126,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
@@ -151,6 +150,15 @@ servers:
     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
@@ -158,28 +166,28 @@ servers:
   raff:
     address: 192.25.206.59
     parents: samosa
-    hostgroups: computers, no-udev, service, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client
+    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, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts
+    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
+    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, postgres83-hosts, ulogd-hosts, nfs-server
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny
   peri:
     address: 192.25.206.15
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     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
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -188,7 +196,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, bind9-hosts, single-cpu
+    hostgroups: computers, porterbox, lenny, hasbootfs
   merulo:
     address: 192.25.206.58
     parents: samosa
@@ -197,27 +205,27 @@ servers:
   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
     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
     contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -229,6 +237,14 @@ servers:
 #    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, service, dl360, rsyslog-hosts, acpid-hosts, lenny
+  handel:
+    address: 82.195.75.104
+    parents: unger
+    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs
 
   master:
     address: 70.103.162.29
@@ -247,19 +263,19 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, no-udev, buildd
+    hostgroups: computers, no-udev, buildd, hasbootfs
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, no-udev, 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
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, no-udev, 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
@@ -268,7 +284,7 @@ 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
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
@@ -277,11 +293,11 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs
   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, no-samhain
 
   klecker:
     address: 194.109.137.218
@@ -294,9 +310,9 @@ servers:
     hostgroups: computers, no-udev, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
 
   argento:
-    address: 195.49.152.174
+    address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
 
   pergolesi:
@@ -306,7 +322,7 @@ servers:
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, single-cpu, deadslow
+    hostgroups: computers, no-udev, porterbox, single-cpu
 
   raptor:
     address: 195.243.109.162
@@ -317,13 +333,13 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs
     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
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -356,7 +372,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
@@ -411,7 +427,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, no-samhain
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
     contacts: luk
 
   agnesi:
@@ -420,14 +436,14 @@ servers:
     hostgroups: deadslow
 
   spontini:
-    address: 137.82.84.42
+    address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, hasbootfs
     contacts: lfilipoz
   ravel:
-    address: 137.82.84.43
+    address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs
 
   lebrun:
     address: 193.198.184.10
@@ -436,28 +452,42 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, hasbootfs
 
   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, ulogd-hosts, acpid-hosts
+    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, hasbootfs
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs
+
+  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, hasbootfs
+  goedel:
+    address: 213.188.99.214
+    parents: gw-cst
+    hostgroups: computers, single-cpu, hasbootfs, lenny
 
 #############################
 # host groups
@@ -473,6 +503,9 @@ 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:
@@ -523,9 +556,9 @@ hostgroups:
     alias: hosts not running samhain properly
     private: 1
 
-  syslog-ng-hosts:
-    alias: hosts running syslog-ng instead of sysklogd
-    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
@@ -553,9 +586,9 @@ 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
@@ -596,6 +629,9 @@ hostgroups:
   smart:
     alias: hosts with smartd
     private: 1
+  hasbootfs:
+    alias: hosts with a /boot
+    private: 1
 
 
 #############################
@@ -627,7 +663,7 @@ services:
   -
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
-    hostgroups: all
+    hostgroups: pingable
     excludehostgroups: routing-infrastructure, dialup
     normal_check_interval: 5
     max_check_attempts: 4
@@ -648,7 +684,7 @@ 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 /
@@ -665,12 +701,12 @@ 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, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball
+    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, lebrun, tartini, morales, powell
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell, escher
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -685,7 +721,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, powell, puccini
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini, zelenka
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -695,7 +731,7 @@ 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, powell, piatti
+    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -705,7 +741,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun, rem, ball
+    hosts: raptor, voltaire, lebrun, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -827,6 +863,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
@@ -873,7 +910,7 @@ services:
     normal_check_interval:  360
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-4"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
     normal_check_interval:  360
@@ -920,18 +957,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
 
  ###
@@ -946,10 +983,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
@@ -960,12 +997,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
  ###
@@ -974,17 +1011,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
@@ -1290,7 +1327,7 @@ services:
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
-    excludehosts: lobos, villa
+    excludehosts: lobos
 
 
  ############ Processes/Services that only run on some computers ############
@@ -1300,12 +1337,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
@@ -1388,7 +1419,7 @@ services:
  ###
   -
     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'"
+    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
@@ -1400,13 +1431,13 @@ services:
   -
     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, gluck
+    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, gluck
+    excludehosts: samosa, raptor, allegri, gluck, zelenka
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1482,7 +1513,7 @@ 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
@@ -1566,6 +1597,11 @@ services:
     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'"
@@ -1597,6 +1633,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
@@ -1616,7 +1662,13 @@ services:
   -
     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
+    hosts: lobos
+
+ ####
+  -
+    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
 
  ###
   -
@@ -1624,6 +1676,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
 
  ###
   -
@@ -1632,20 +1685,20 @@ 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
+    hosts: lobos, steffani, kassia, master
  ###
   -
     name: process - smartd
@@ -1684,3 +1737,46 @@ services:
     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