X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=2ae3e29c778343707a91948450b1b39c90b21527;hb=aea4ae5809c4585c5d4b2f1cbda5410e95ac9304;hp=7a6ce31950e39afd9dcf46dc4fa14b3f92d31e3e;hpb=4d5ed3a00585a9eb3154b680d85d65e9de6e5de6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7a6ce31..2ae3e29 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -105,7 +105,6 @@ servers:
     address: 82.195.75.126
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-    contacts: joerg, bzed
   gw-marist:
     address: 148.100.96.1
     parents: gw-ubcece
@@ -140,6 +139,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
     contact_groups: +alioth-admins
+    no-servicegroups: true
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
@@ -179,7 +179,7 @@ servers:
     address: 212.227.126.54
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, squeeze
+    hostgroups: computers, acpid-hosts, service, squeeze, bacula-client
   chopin:
     address: 195.20.242.124
     parents: schumann
@@ -187,11 +187,11 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze, bacula-client
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze, apache-https
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, squeeze, apache-https, bacula-client
   wieck:
     address: 195.20.242.89
     parents: gw-ubcece
@@ -251,12 +251,12 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
   # {{{ gw-brainfood
-  master:
-    address: 70.103.162.29
+  old-master:
+    address: 97.107.116.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
+    hostgroups: computers, general, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze, bacula-client
   murphy:
-    address: 70.103.162.31
+    address: 97.107.116.31
     parents: gw-brainfood
     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
   # }}}
@@ -318,12 +318,6 @@ servers:
     address: 93.94.130.160
     parents: gw-dgi
     hostgroups: computers, sw-raid, hassrvfs, wheezy
-    contacts: bzed
-  widor:
-    address: 93.94.130.161
-    parents: gw-dgi
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
-    contacts: bzed
   # }}}
   # {{{ gw-ftcollins
   alkman:
@@ -338,10 +332,6 @@ servers:
     address: 192.25.206.62
     parents: gw-ftcollins
     hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
-  samosa:
-    address: 192.25.206.57
-    parents: gw-ftcollins
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
@@ -361,7 +351,7 @@ servers:
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze, bacula-client
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
@@ -370,7 +360,7 @@ servers:
     address: 194.177.211.201
     parents: rautavaara
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    #, mptraid
+    contacts: christoph
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
@@ -434,31 +424,32 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
   clementi:
     address: 82.195.75.103
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
   bendel:
     address: 82.195.75.100
-    parents: czerny
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
-  new-master:
+  master:
     address: 82.195.75.110
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, bacula-client, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
-    parents: czerny
+    parents: ganeti3
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    contacts: christoph
   vento:
     address: 82.195.75.98
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, apache2-hosts, heavy-exim
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, heavy-exim
   lully:
     address: 82.195.75.99
-    parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs, bacula-client
   rem:
     address: 82.195.75.68
     parents: gw-man-da
@@ -469,28 +460,40 @@ servers:
     hostgroups: computers, service, dl360, acpid-hosts, squeeze
   diamond:
     address: 82.195.75.108
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
   draghi:
     address: 82.195.75.106
-    parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze
+    parents: ganeti3
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, squeeze, bacula-client
   geo1:
     address: 82.195.75.105
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
   handel:
     address: 82.195.75.104
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
   kaufmann:
     address: 82.195.75.107
-    parents: unger
+    parents: ganeti3
     hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, squeeze
-#  lamb:
-#    address: 82.195.75.101
-#    parents: unger
-#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  ganeti3:
+    address: 82.195.75.111
+    parents: gw-man-da
+    hostgroups: notacomputer
+  wilder:
+    address: 82.195.75.112
+    parents: ganeti3
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client
+  vieuxtemps:
+    address: 82.195.75.113
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, varnish-hosts
+  mailly:
+    address: 82.195.75.114
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-marist
   zappa:
@@ -506,11 +509,11 @@ servers:
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze, hasvarlogfs
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -535,7 +538,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -575,7 +578,7 @@ servers:
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze
+    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze, bacula-client
   eder:
     address: 86.59.118.151
     parents: gw-sil
@@ -609,11 +612,19 @@ servers:
     parents: gw-telegraaf2
     hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
+    no-servicegroups: true
   wagner:
     address: 217.196.43.132
     parents: gw-telegraaf2
     hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
+    no-servicegroups: true
+  anonscm:
+    address: 217.196.43.132
+    parents: wagner
+    contact_groups: alioth-admins
+    hostgroups: secondary-IPs
+    no-servicegroups: true
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -674,10 +685,14 @@ servers:
     address: 206.12.19.118
     parents: luchesi
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
+  dinis:
+    address: 206.12.19.139 
+    parents: ganeti2
+    hostgroups: computers, general, kvmdomains, squeeze, bacula-client
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy, bacula-client
   brahms:
     address: 206.12.19.115
     parents: dijkstra
@@ -718,10 +733,12 @@ servers:
     address: 206.12.19.110
     parents: luchesi
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    contacts: christoph
   finzi:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    contacts: christoph
   fischer:
     address: 206.12.19.112
     parents: luchesi
@@ -729,7 +746,7 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
-    hostgroups: computers, porterbox, squeeze
+    hostgroups: computers, porterbox, wheezy
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
@@ -741,7 +758,7 @@ servers:
   rossini:
     address: 206.12.19.19
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
   salieri:
     address: 206.12.19.20
     parents: sw-ubcece-kais
@@ -777,7 +794,7 @@ servers:
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, xinetd-hosts
   dukas:
     address: 206.12.19.128
     parents: traetta
@@ -793,7 +810,7 @@ servers:
   berlioz:
     address: 206.12.19.131
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https, bacula-client
   gombert:
     address: 206.12.19.132
     parents: traetta
@@ -813,7 +830,7 @@ servers:
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, bacula-client
   bizet:
     address: 206.12.19.137
     parents: traetta
@@ -833,7 +850,7 @@ servers:
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, postgres91-hosts, nfs-client, apache2-hosts, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
@@ -841,7 +858,8 @@ servers:
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, squeeze, hassrvfs, apache2-hosts
+    #, apache-https
   coincy:
     address: 206.12.19.144
     parents: ganeti2
@@ -850,6 +868,10 @@ servers:
     address: 206.12.19.145
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+  muffat:
+    address: 206.12.19.146
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
   # }}}
   # {{{ gw-ugent
   ancina:
@@ -868,7 +890,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1023,6 +1045,9 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
+  varnish-hosts:
+    alias: hosts running varnish
+    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -1069,6 +1094,10 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  
+  bacula-client:
+    alias: hosts which are backuped with bacula
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -1146,6 +1175,8 @@ servicegroups:
     alias: buildd checks
   raid:
     alias: raid checks
+  backup:
+    alias: backup checks
   kernel:
     alias: kernel checks
   weaksshkeys:
@@ -1240,12 +1271,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
-    excludehosts: ries, beach
+    excludehosts: stabile, beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: ries, beach
+    hosts: stabile, beach
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1270,7 +1301,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa, stabile, sibelius, busoni, buxtehude
+    hosts: stabile, sibelius, busoni, buxtehude
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1356,6 +1387,7 @@ services:
  ####
   -
     name: backup
+    servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
     normal_check_interval: 60
@@ -1363,11 +1395,40 @@ services:
     retry_check_interval: 5
   -
     name: backup server config
+    servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: beethoven
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
+  -
+    name: backup - bacula - last backup
+    servicegroups: backup
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula $HOSTNAME$.debian.org"
+    runfrom: dinis
+    hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: backup - bacula - last full backup
+    servicegroups: backup
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -w 840 -c 1560 $HOSTNAME$.debian.org F"
+    runfrom: dinis
+    hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: process - bacula-fd
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
+    hostgroups: computers
+    excludehostgroups: freebsd
+    excludehosts: wagner, vasks
+  -
+    name: process - bacula-fd
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
+    hostgroups: freebsd
 
  ####
   -
@@ -1574,7 +1635,7 @@ services:
  ###
   -
     name: process - cron
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C cron -a /usr/sbin/cron"
     hostgroups: computers
 
  ###
@@ -1711,6 +1772,12 @@ services:
     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
+    excludehostgroups: wheezy
+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u 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
+    excludehostgroups: squeeze
   -
     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'"
@@ -1856,6 +1923,13 @@ services:
     hostgroups: computers
     excludehosts: vasks, wagner
     excludehostgroups: freebsd
+  -
+    name: system - filesystem check
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
+    normal_check_interval:  60
+    retry_check_interval: 15
+    excludehosts: wagner, vasks
+    hostgroups: computers
  ###
   -
     name: local resolver
@@ -1941,6 +2015,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /var/run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
+    excludehosts: argento
+  -
+    # wheezy:
+    name: process - mdadm monitor
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
+    hosts: argento
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -1964,6 +2045,7 @@ services:
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: franck
+    excludehostgroups: wheezy
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1975,6 +2057,13 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: schein
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
+    normal_check_interval: 120
+    hosts: schein
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2137,9 +2226,9 @@ services:
 
  ###
   -
-    name: process - nagios3
+    name: process - icinga
     # there is always one extra process per check currently running..
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
 
  ###
@@ -2206,6 +2295,33 @@ services:
     excludehosts: ravel
     normal_check_interval: 60
 
+###
+  -
+    name: process - varnish - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+  -
+    name: process - varnish - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u nobody -C varnishd -a '/usr/sbin/varnishd -P /var/run/varnishd.pid -a :80 -T localhost:6082 -f /etc/varnish/default.vcl'"
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+  -
+    name: network service - http
+    check: check_http
+    hostgroups: varnish-hosts
+    depends: process - varnish - master
+
+###
+
+# Alioth web URLs
+
+  -
+    name: network service - loggerhead
+    remotecheck: "/usr/lib/nagios/plugins/check_http -H anonscm.debian.org -u /loggerhead/"
+    hosts: anonscm
+    runfrom: tchaikovsky
+    depends: wagner:process - apache2 - master
+
  ####
   -
     name: process - named
@@ -2235,62 +2351,57 @@ services:
     depends: klecker:process - xinetd
 
  ####
+  #-
+  #  name: process - debianqueued
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
   -
     name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak-unpriv -C debianqueued"
     hostgroups: uploadqueue
 
+
  ###
   #-
-  #  name: process - postresql81 - master
+  #  name: process - postgresql81 - master
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a '/usr/lib/postgresql/8.1/bin/postmaster -D /var/lib/postgresql/8.1/main -c config_file=/etc/postgresql/8.1/main/postgresql.conf'"
   #  hostgroups: postgres81-hosts
   #-
-  #  name: process - postresql81 - writer
+  #  name: process - postgresql81 - writer
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: writer process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
   #-
-  #  name: process - postresql81 - buffer
+  #  name: process - postgresql81 - buffer
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats buffer process'"
   #  hostgroups: postgres81-hosts
-  #  depends: process - postresql81 - master
+  #  depends: process - postgresql81 - master
   #-
-  #  name: process - postresql81 - collector
+  #  name: process - postgresql81 - collector
   #  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
+  #  depends: process - postgresql81 - master
  ####
   -
-    name: unwanted process - postresql
+    name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
     excludehostgroups: postgres90-hosts, postgres84-hosts, postgres91-hosts, deadslow
   -
-    name: process - postresql91 - master
+    name: process - postgresql91 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
     hostgroups: postgres91-hosts
   -
-    name: process - postresql90 - master
+    name: process - postgresql90 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.0/bin/postgres'"
     hostgroups: postgres90-hosts
   -
-    name: process - postresql84 - master
+    name: process - postgresql84 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
     hosts: beethoven
- ####
-  -
-    name: process - stunnel4 - postgres-udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
-    hosts: samosa
-  -
-    name: udd stunnel - master cert
-    nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
-    hosts: samosa
  ####
  ####
   -
@@ -2494,7 +2605,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7434 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini