X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=153250a907eb30c291a5b2ae43274b645324aee8;hb=0c580085acb2a2a60f5ebe78f51bbe21808e08d0;hp=58f5bd583ab0bf752eddcb937e6d7ed174be8081;hpb=011f44c1a5da8b0e74e942c0e04844f87d159927;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 58f5bd5..153250a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -80,9 +80,9 @@ servers:
     address: 193.62.202.20
     parents: gw-ubc
     hostgroups: routing-infrastructure
-    contacts: tjrc1
+    contacts: tjrc1, dave
   gw-frost:
-    address: 130.81.242.195
+    address: 130.81.27.83
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-1und1:
@@ -186,7 +186,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts, apache2-hosts
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
@@ -202,7 +202,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, squeeze
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -230,11 +230,6 @@ servers:
     parents: gw-HP-ftc
     hostgroups: computers, buildd, acpid-hosts
 
-  bartok:
-    address: 82.195.75.91
-    parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
-    contacts: joerg, bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -253,12 +248,16 @@ servers:
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, apache-https
     contacts: bzed
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service
+  nielsen:
+    address: 82.195.75.99
+    parents: gw-man-da
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -266,7 +265,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts
   geo1:
     address: 82.195.75.105
     parents: unger
@@ -274,7 +273,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https
   kaufmann:
     address: 82.195.75.107
     parents: unger
@@ -282,15 +281,19 @@ servers:
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
+    hostgroups: computers, buildd, hasbootfs
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts, postgres84-hosts
+    hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay
   byrd:
     address: 82.195.75.92
     parents: unger
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  lamb:
+    address: 82.195.75.101
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
 
   master:
     address: 70.103.162.29
@@ -305,12 +308,12 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs
+    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, postgres84-hosts
 
   franck:
     address: 128.148.34.3
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https
 
   mayer:
     address: 140.211.166.78
@@ -323,7 +326,8 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa
+    #, bosserver
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -374,7 +378,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts
 
   saens:
     address: 128.101.240.212
@@ -390,7 +394,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, bind9-hosts
     contacts: bzed
 
   pergolesi:
@@ -403,23 +407,23 @@ servers:
     parents: gw-sanger
     # SMP kernel doesn't run stable
     hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
-    contacts: tjrc1
+    contacts: tjrc1, dave
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
     hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs
-    contacts: tjrc1
+    contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts, service
-    contacts: tjrc1
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze
+    contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
     hostgroups: computers, porterbox, sw-raid, sparc
-    contacts: tjrc1
+    contacts: tjrc1, dave
 
   voltaire:
     address: 72.66.115.54
@@ -430,7 +434,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts
     contacts: joerg
 
   schumann:
@@ -444,7 +448,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres84-hosts, apache-https
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -452,7 +456,7 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts
 
   caballero:
     address: 193.201.200.200
@@ -511,11 +515,11 @@ servers:
     hostgroups: computers, bl460, acpid-hosts, service
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts
   brahms:
     address: 206.12.19.115
     parents: dijkstra
@@ -535,7 +539,7 @@ servers:
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service
+    hostgroups: computers, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim, service, apache2-hosts
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
@@ -543,23 +547,19 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service
-  cimarosa:
-    address: 206.12.19.8
-    parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts, service
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, ftpd-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, service, apache2-hosts
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -595,11 +595,39 @@ servers:
   salieri:
     address: 206.12.19.20
     parents: tchaikovsky
-    hostgroups: computers, dl585, acpid-hosts, service
+    hostgroups: computers, dl585, acpid-hosts, service, squeeze
   traetta:
     address: 206.12.19.21
     parents: tchaikovsky
     hostgroups: computers, dl585, acpid-hosts, service
+  schuetz:
+    address: 206.12.19.119
+    parents: tchaikovsky
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  locke:
+    address: 206.12.19.120
+    parents: tchaikovsky
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
+  lotti:
+    address: 206.12.19.121
+    parents: tchaikovsky
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  quantz:
+    address: 206.12.19.122
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts
+  nono:
+    address: 206.12.19.123
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
+  reger:
+    address: 206.12.19.124
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, heavy-exim
+  danzi:
+    address: 206.12.19.125
+    parents: luchesi
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -652,7 +680,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts
 
 #  lafayette:
 #    address: 147.215.7.160
@@ -662,11 +690,11 @@ servers:
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service
+    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
   fasch:
     address: 194.177.211.201
     parents: rautavaara
@@ -703,7 +731,7 @@ servers:
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs, apache2-hosts
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -717,7 +745,7 @@ servers:
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -730,7 +758,7 @@ servers:
   lindberg:
     address: 86.59.118.149
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
     # which raid?
 
   abel:
@@ -856,6 +884,9 @@ hostgroups:
   heavy-exim:
     alias: "hosts running the full mail stuff, including clamav and postgrey"
     private: 1
+  mail-relay:
+    alias: "relays usually are hosts with more exim processes"
+    private: 1
   spamd:
     alias: "hosts running spamassassin as daemon"
     private: 1
@@ -892,6 +923,9 @@ hostgroups:
   postgres84-hosts:
     alias: hosts running postgres84
     private: 1
+  postgres90-hosts:
+    alias: hosts running postgres90
+    private: 1
   mysql-hosts:
     alias: hosts running mysql
     private: 1
@@ -907,6 +941,12 @@ hostgroups:
   uploadqueue:
     alias: hosts that are an anonymous ftp uploadqueue
     private: 1
+  bosserver:
+    alias: hosts running bosserver
+    private: 1
+  apache-https:
+    alias: hosts with https services
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -944,6 +984,9 @@ hostgroups:
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
+  hasvicepa:
+    alias: hosts with a /vicepa
+    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1015,12 +1058,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: klecker, kassia, spohr
+    excludehosts: klecker, kassia, spohr, liszt
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: klecker, kassia, spohr
+    hosts: klecker, kassia, spohr, liszt
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1040,12 +1083,18 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-    hosts: merkel, bartok
+    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hostgroups: hassrvfs
+    excludehosts: ries
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
+    hosts: ries
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -1086,27 +1135,22 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni
+    hosts: busoni, wieck, heininen
 
   -
     name: disk usage on /srv/morgue.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
     hosts: stabile
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
     hosts: stabile, beethoven, sibelius
-  -
-    name: disk usage on /srv/ftp-master.debian.org
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org"
-    hosts: stabile
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: stabile,sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-01
@@ -1148,6 +1192,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
     hosts: vivaldi
+  -
+    name: disk usage on /vicepa
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
+    hostgroups: hasvicepa
 
  ############ All Computers ############
  ####
@@ -1170,7 +1219,7 @@ services:
   -
     name: backup server config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: bartok, beethoven
+    hosts: beethoven
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1184,6 +1233,35 @@ services:
     normal_check_interval: 60
     retry_check_interval: 5
 
+ ####
+  - name: afs - space
+    hostgroups: bosserver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
+
+  - name: afs - bos
+    hostgroups: bosserver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
+
+  - name: afs - waiting connections
+    hostgroups: bosserver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
+
+  #- name: afs - udebug
+  #  hostgroups: bosserver
+  #  nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-udebug -H localhost"
+  #  normal_check_interval: 60
+  #  max_check_attempts: 2
+  #  retry_check_interval: 5
+
  ####
   -
     name: puppet
@@ -1310,11 +1388,11 @@ services:
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
-    excludehostgroups: squeeze
+    excludehostgroups: freebsd
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
-    hostgroups: squeeze
+    hostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1356,12 +1434,12 @@ 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: computers
-    excludehostgroups: squeeze
+    excludehostgroups: freebsd
 
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: squeeze
+    hostgroups: freebsd
 
   -
     name: remote logging
@@ -1374,18 +1452,22 @@ services:
     name: process - exim
     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, busoni, merkel
+    excludehostgroups: postfix-hosts, mail-relay
+    excludehosts: master, busoni, merkel, quantz
+  -
+    name: process - exim
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
+    hostgroups: mail-relay
   -
     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, busoni, merkel
+    excludehosts: master, busoni, merkel, quantz
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, busoni, merkel
+    hosts: master, busoni, merkel, quantz
  ###
   -
     name: process - clamav - clamd
@@ -1649,7 +1731,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg
+    excludehosts: grieg, byrd
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1791,7 +1873,7 @@ services:
  ###
   -
     name: process - udevd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -p 1 -C udevd -a 'udevd'"
     hostgroups: computers
     excludehostgroups: no-udev, freebsd
   -
@@ -1808,12 +1890,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
     hostgroups: computers
     excludehostgroups: acpid-hosts, kvmdomains
+ ###
+  -
+    name: process - bosserver
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
+    hostgroups: bosserver
 
  ###
   -
     name: process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg
+    hosts: grieg, byrd
  ###
   -
     name: process - xinetd
@@ -1870,6 +1957,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+  -
+    name: unwanted process - apache2
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"
+    hostgroups: computers
+    excludehostgroups: apache2-hosts
 
   -
     name: network service - http
@@ -1895,37 +1987,24 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
+    hostgroups: apache-https
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    # ries		ftp-master.debian.org
-    # chopin		security-master.debian.org
-    # spohr		rt.debian.org
-    # tchaikovsky	nagios.debian.org
-    # draghi		db.debian.org
-    # merkel2		nm.debian.org
-    # liszt		lists.debian.org
-    # grieg		buildd.debian.org
-    # vivaldi		fossology.debian.org
-    hosts: franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
+    hostgroups: apache-https
     depends: network service - https
     normal_check_interval: 60
-
-  # merkel
-  -
-    name: network service - https
-    check: check_https
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
-    normal_check_interval: 120
   -
-    name: network service - http
-    check: check_http
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
+    name: unwanted network service - https
+    check: dsa_check_port_closed!443
+    hostgroups: apache2-hosts
+    excludehostgroups: apache-https
+    # ravel does ssh on port 443
+    excludehosts: ravel
+    normal_check_interval: 60
+
  ####
   -
     name: process - named
@@ -1993,26 +2072,35 @@ services:
   #  hostgroups: postgres81-hosts
   #  depends: process - postresql81 - master
  ####
+  -
+    name: unwanted process - postresql
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
+    hostgroups: computers
+    excludehostgroups: postgres90-hosts, postgres84-hosts, postgres83-hosts
+  -
+    name: process - postresql90 - 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
     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: 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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres'"
     hostgroups: postgres83-hosts
   #-
   #  name: process - postresql83 - master udd
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
   #  hosts: piatti
-  -
-    name: process - postresql83 - dak master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
-    hosts: klecker, chopin
+  #-
+  #  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: chopin
   -
     name: process - postresql84 - dak master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-    hosts: franck
+    hosts: franck, chopin
   -
     name: process - postresql84 - dak-dev master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
@@ -2042,6 +2130,23 @@ services:
     name: udd stunnel - master cert
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 8080 -S -C 14 -t 45"
     hosts: samosa
+ ####
+  -
+    name: process - krb - kdc
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kdc -a '/usr/lib/heimdal-servers/kdc --config-file=/etc/heimdal-kdc/kdc.conf'"
+    hosts: schuetz, byrd
+  -
+    name: process - krb - iprop - slave
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-slave -a '/usr/sbin/ipropd-slave byrd.debian.org'"
+    hosts: schuetz
+  -
+    name: process - krb - iprop - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-master -a '/usr/sbin/ipropd-master'"
+    hosts: byrd
+  -
+    name: process - krb - kpasswdd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kpasswdd -a '/usr/lib/heimdal-servers/kpasswdd'"
+    hosts: byrd
  ###
   -
     name: process - UPS - nut usbhid-ups - ups1
@@ -2151,6 +2256,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
     hosts: bellini
 
+  -
+    name: nfs server stabile reachable
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
+    hosts: quantz
+
  ############ MISC OTHER Stuff ############
  #####
   -
@@ -2174,7 +2284,7 @@ services:
     retry_check_interval: 5
   -
     name: mirror sync - snapshot
-    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!1800:28800"
+    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
     hosts: global
     normal_check_interval: 15
     max_check_attempts: 5