X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=5b3eb09abe3321aa956c72d2ee8bc0e798ee11c4;hb=c8b9d17ed355b826cc191d822e8d5f7da86d8d1f;hp=af7c44650055004fb630d4e308cc5c0ac7dd9a49;hpb=1c1f19b9009db09c59cb7c6ff50952546f5cbd08;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index af7c446..5b3eb09 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -5,13 +5,11 @@
 # 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
 
@@ -154,6 +152,14 @@ servers:
     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
@@ -162,70 +168,70 @@ servers:
 
   samosa:
     address: 192.25.206.57
-    hostgroups: computers, no-udev, 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, no-udev, service, dl380, apache2-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, lenny, puppet
   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, puppet
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, apache2-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, lenny, puppet
   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, 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, no-udev, buildd
+    hostgroups: computers, buildd, lenny, puppet
   paer:
     address: 192.25.206.11
     parents: samosa
-    hostgroups: computers, porterbox, lenny
+    hostgroups: computers, porterbox, lenny, hasbootfs, puppet
   merulo:
     address: 192.25.206.58
     parents: samosa
-    hostgroups: computers, no-udev, 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, no-samhain
+    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
@@ -237,37 +243,45 @@ 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, puppet
+  handel:
+    address: 82.195.75.104
+    parents: unger
+    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs, puppet
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, no-udev, 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, postfix-hosts, dl380, acpid-hosts
+    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, acpid-hosts
+    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, 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, lenny
+    hostgroups: computers, buildd, lenny, puppet, smart
   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
@@ -276,67 +290,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, acpid-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, no-samhain
+    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, no-udev, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
 
   argento:
     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, no-udev, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, no-udev, 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
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu
+    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
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet
     contacts: tjrc1
 
   verdi:
@@ -347,33 +367,33 @@ 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, buildd, lenny, rsyslog-hosts, ulogd-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
+    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
+    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
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid, bind9-hosts
+    hostgroups: computers, no-udev, buildd, sw-raid, lenny, puppet
 
   elara:
     address: 67.210.160.90
@@ -397,12 +417,12 @@ servers:
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart
+    hostgroups: computers, porterbox, single-cpu, smart, lenny, puppet
 
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts
+    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
@@ -419,7 +439,7 @@ servers:
   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:
@@ -430,12 +450,12 @@ servers:
   spontini:
     address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, hasbootfs, lenny, puppet
     contacts: lfilipoz
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, puppet
 
   lebrun:
     address: 193.198.184.10
@@ -444,42 +464,52 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid
+    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, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny
+    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, lenny, puppet
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, puppet
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, lenny
+    hostgroups: computers, porterbox, lenny, puppet
 
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu
+    hostgroups: computers, single-cpu, hasbootfs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu
+    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, lenny, puppet
 
 #############################
 # host groups
@@ -523,6 +553,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
@@ -548,9 +583,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
@@ -621,6 +656,9 @@ hostgroups:
   smart:
     alias: hosts with smartd
     private: 1
+  hasbootfs:
+    alias: hosts with a /boot
+    private: 1
 
 
 #############################
@@ -673,24 +711,24 @@ 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, schroeder, piatti, rem, ball, goedel, escher
+    hostgroups: hasbootfs
   -
     name: disk usage on /var
     servicegroups: diskspace
@@ -700,7 +738,7 @@ services:
     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, spontini, ravel, mahler, schroeder, piatti, pescetti
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -791,6 +829,17 @@ 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
@@ -800,11 +849,11 @@ services:
   -
     name: samhain
     servicegroups: samhain
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-samhain -t 45"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
     excludehostgroups: no-samhain
     depends: process - samhain
-    normal_check_interval: 240
+    normal_check_interval: 60
     retry_check_interval: 5
 
  ####
@@ -890,32 +939,32 @@ services:
     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-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-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
@@ -972,10 +1021,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
@@ -986,12 +1035,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
  ###
@@ -1316,7 +1365,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 ############
@@ -1515,7 +1563,7 @@ services:
     check: dsa_check_cert!443
     hosts: samosa, ries
     depends: network service - https
-    normal_check_interval: 240
+    normal_check_interval: 60
  ####
   -
     name: process - named
@@ -1586,31 +1634,19 @@ 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
+    excludehosts: piatti, klecker
   -
-    name: process - postresql83 - master
+    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 - 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 - 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 - 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 - 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
@@ -1647,11 +1683,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
 
  ###
   -
@@ -1677,11 +1712,6 @@ services:
 #    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