Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios: (31 commits)
  add load to dependencies for nrpe checks
  no more liszt
  decommission heininen (RT#3870)
  new thresholds for /srv/mirrors
  Add a license to dsa-update-apt-status
  Exclude all freebsd hosts from ekey stunnel stuff
  Add falla
  Add fischer
  hoiby is a buildd now
  Create a hostgroup for hosts with a /var/log, and also add sibelius to that group
  /srv/snapshot.debian.org special casing on stabile
  Replace heininen with lully
  Add lully
  Ignore home/buildd/build-trees for du checks
  retire hebden (RT#3819)
  oops, missing dep
  consolidate ftp checks
  bizet no longer has vsftpd listener
  morricone no longer has vsftpd listener
  gluck no longer has vsftpd listener
  ...

diff --combined config/nagios-master.cfg
index 165f4b3,fc9d663..7b0235e
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -199,7 -199,7 +199,7 @@@ servers
    wieck:
      address: 195.20.242.89
      parents: gw-1und1-sec
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
    # }}}
    # {{{ gw-accumu
    pettersson:
@@@ -248,10 -248,6 +248,6 @@@
      address: 217.140.96.68
      parents: gw-arm
      hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
-   hebden:
-     address: 217.140.96.69
-     parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
    henze:
      address: 217.140.96.70
      parents: gw-arm
@@@ -259,7 -255,7 +255,7 @@@
    hoiby:
      address: 217.140.96.71
      parents: gw-arm
-     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
    # }}}
    # {{{ gw-brainfood
    master:
@@@ -285,7 -281,7 +281,7 @@@
    santoro:
      address: 200.17.202.197
      parents: gw-c3sl
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT, security_mirror
      contacts: faw
    # }}}
    # {{{ gw-carnet
@@@ -302,7 -298,7 +298,7 @@@
    gluck:
      address: 150.203.164.38
      parents: gw-cecsit
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, security_mirror
    # }}}
    # {{{ gw-conova
    sompek:
@@@ -322,7 -318,7 +318,7 @@@
    steffani:
      address: 128.31.0.36
      parents: gw-csail
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
    # }}}
    # {{{ gw-dgi
    argento:
@@@ -441,7 -437,7 +437,7 @@@
    schein:
      address: 149.20.20.6
      parents: gw-isc
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze, security_mirror
    # }}}
    # {{{ gw-karlsruhe
    zemlinsky:
@@@ -472,7 -468,7 +468,7 @@@
    bendel:
      address: 82.195.75.100
      parents: czerny
-     hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts
+     hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
    new-master:
      address: 82.195.75.110
      parents: czerny
@@@ -481,19 -477,14 +477,14 @@@
      address: 82.195.75.97
      parents: gw-man-da
      hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
-   liszt:
-     address: 82.195.75.101
-     parents: gw-man-da
-     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385, acpid-hosts, apache-https, lenny
-     contacts: bzed
-   heininen:
-     address: 82.195.75.98
-     parents: gw-man-da
-     hostgroups: computers, acpid-hosts, service, squeeze, megactl
+   lully:
+     address: 82.195.75.99
+     parents: czerny
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs
    rem:
      address: 82.195.75.68
      parents: gw-man-da
-     hostgroups: computers, buildd, hasbootfs, hashomefs, squeeze
+     hostgroups: computers, buildd, hasbootfs, hassrvfs, squeeze
    sperger:
      address: 82.195.75.34
      parents: gw-man-da2
@@@ -539,7 -530,7 +530,7 @@@
    busoni:
      address: 140.211.15.34
      parents: gw-osuosl
-     hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
+     hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze, hasvarlogfs
    # malo TODO
    mayer:
      address: 140.211.166.78
@@@ -582,7 -573,7 +573,7 @@@
    sibelius:
      address: 193.62.202.28
      parents: gw-sanger
-     hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
+     hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts, hasvarlogfs
      contacts: tjrc1, dave
    smetana:
      address: 193.62.202.29
@@@ -594,11 -585,11 +585,11 @@@
    lobos:
      address: 212.211.132.250
      parents: gw-scanplus-lobos
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
    villa:
      address: 212.211.132.32
      parents: gw-scanplus-villa
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
    # }}}
    # {{{ gw-sil
    beethoven:
@@@ -670,7 -661,7 +661,7 @@@
    ravel:
      address: 206.12.19.5
      parents: sw-ubcece-kais
-     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
+     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs, uploadqueue
    dijkstra:
      address: 206.12.19.218
      parents: sw-ubcece-kais
@@@ -707,10 -698,6 +698,6 @@@
      address: 206.12.19.114
      parents: dijkstra
      hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, service, squeeze, nfs-server
-   valente:
-     address: 206.12.19.112
-     parents: dijkstra
-     hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts, service, lenny
    bellini:
      address: 206.12.19.7
      parents: sw-ubcece-kais
@@@ -718,7 -705,7 +705,7 @@@
    morricone:
      address: 206.12.19.9
      parents: sw-ubcece-kais
-     hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
+     hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, postgres90-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
    stabile:
      address: 206.12.19.13
      parents: sw-ubcece-kais
@@@ -743,6 -730,10 +730,10 @@@
      # unless we implement runfrom for host alive checks
      pingable: false
      check_command: dsa_check_always_ok
+   falla:
+     address: 206.12.19.117
+     parents: luchesi
+     hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
    fano:
      address: 206.12.19.110
      parents: luchesi
@@@ -751,6 -742,10 +742,10 @@@
      address: 206.12.19.111
      parents: luchesi
      hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+   fischer:
+     address: 206.12.19.112
+     parents: luchesi
+     hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
    gabrielli:
      address: 206.12.19.17
      parents: sw-ubcece-kais
@@@ -803,14 -798,14 +798,14 @@@
      address: 206.12.19.126
      parents: traetta
      hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
 -#  dukas:
 -#    address: 206.12.19.128
 -#    parents: traetta
 -#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
 -#  tye:
 -#    address: 206.12.19.129
 -#    parents: traetta
 -#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
 +  dukas:
 +    address: 206.12.19.128
 +    parents: traetta
 +    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
 +  tye:
 +    address: 206.12.19.129
 +    parents: traetta
 +    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
    elgar:
      address: 206.12.19.130
      parents: salieri
@@@ -842,7 -837,7 +837,7 @@@
    bizet:
      address: 206.12.19.137
      parents: traetta
-     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
+     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, uploadqueue
    lilburn:
      address: 206.12.19.138
      parents: dijkstra
@@@ -863,7 -858,7 +858,7 @@@
    saens:
      address: 128.101.240.212
      parents: gw-umn
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
    # }}}
    # {{{ gw-utwente
    kassia:
@@@ -885,7 -880,7 +880,7 @@@
    klecker:
      address: 130.89.148.10
      parents: gw-utwente
-     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
    klecker-ftp:
      address: 130.89.148.12
      parents: klecker
@@@ -1049,9 -1044,6 +1044,6 @@@ hostgroups
    amavis-hosts:
      alias: hosts running amavis
      private: 1
-   ftpd-hosts:
-     alias: hosts running vsftpd
-     private: 1
    #tftpd-hosts:
    #  alias: hosts running a tftpd (tftpd-hpa as a daemon)
    #  private: 1
@@@ -1064,9 -1056,6 +1056,6 @@@
    #postgres81-hosts:
    #  alias: hosts running postgres81
    #  private: 1
-   postgres83-hosts:
-     alias: hosts running postgres83
-     private: 1
    postgres84-hosts:
      alias: hosts running postgres84
      private: 1
@@@ -1122,6 -1111,9 +1111,9 @@@
    hasvarfs:
      alias: hosts with a /var filesystem
      private: 1
+   hasvarlogfs:
+     alias: hosts with a /var/log filesystem
+     private: 1
    hasusrfs:
      alias: hosts with a /usr filesystem
      private: 1
@@@ -1149,6 -1141,9 +1141,9 @@@
      alias: machines with hight round trip times
      private: 1
  
+   security_mirror:
+     alias: hosts that are security mirrors
+     private: 1
  #############################
  # servicegroups
  #############################
@@@ -1208,9 -1203,14 +1203,14 @@@ services
    -
      name: disk usage - all
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
+     nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/home/buildd/build-trees"
      hostgroups: computers
-     excludehosts: sibelius
+     excludehosts: sibelius,stabile
+   -
+     name: disk usage - all
+     servicegroups: diskspace
+     nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/srv/snapshot.debian.org"
+     hosts: stabile
    -
      name: disk usage - all
      servicegroups: diskspace
@@@ -1222,12 -1222,12 +1222,12 @@@
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
      hostgroups: computers
-     excludehosts: kassia, spohr, liszt
+     excludehosts: kassia, spohr
    -
      name: disk usage on /
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-     hosts: kassia, spohr, liszt
+     hosts: kassia, spohr
    -
      name: disk usage on /boot
      servicegroups: diskspace
@@@ -1280,11 -1280,10 +1280,10 @@@
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
      hosts: samosa, stabile, sibelius, busoni
  
-   -
      name: disk usage on /var/log
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-     hosts: busoni, wieck, heininen, bendel
+     hostgroups: hasvarlogfs
    -
      name: disk usage on /var/spool/postfix
      servicegroups: diskspace
@@@ -1299,13 -1298,18 +1298,18 @@@
    -
      name: disk usage on /srv/mirrors
      servicegroups: diskspace
-     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
      hosts: beethoven, sibelius
+   -
+     name: disk usage on /srv/snapshot.debian.org
+     servicegroups: diskspace
+     nrpe: "/usr/lib/nagios/plugins/check_disk 94 98 /srv/snapshot.debian.org"
+     hosts: stabile
    -
      name: disk usage on /srv/snapshot.debian.org
      servicegroups: diskspace
      nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
-     hosts: stabile,sibelius
+     hosts: sibelius
    -
      name: disk usage on /srv/farm-snapshot/farm-misc
      servicegroups: diskspace
@@@ -1468,11 -1472,6 +1472,6 @@@
      name: processes - total
      nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
      hostgroups: computers
-     excludehosts: liszt
-   -
-     name: processes - total
-     nrpe: "/usr/lib/nagios/plugins/check_procs 800 1000"
-     hosts: liszt
   ####
    -
      name: swap usage - percent
@@@ -1590,9 -1589,15 +1589,15 @@@
      hostgroups: freebsd
  
    -
-     name: remote logging
+     name: remote logging on lotti
+     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+     runfrom: lotti
+     hostgroups: computers
+     excludehosts: vasks, wagner
+   -
+     name: remote logging on lully
      remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-     runfrom: heininen
+     runfrom: lully
      hostgroups: computers
      excludehosts: vasks, wagner
   ### MAIL STUFF
@@@ -1662,11 -1667,11 +1667,11 @@@
    -
      name: process - spamd - master
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-     hosts: liszt, bendel
+     hosts: bendel
    -
      name: process - spamd - child
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-     hosts: liszt, wagner, bendel
+     hosts: wagner, bendel
      hostgroups: spamd
      depends: process - spamd - master
    #
@@@ -1684,7 -1689,7 +1689,7 @@@
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
      hostgroups: computers
      excludehostgroups: spamd
-     excludehosts: liszt, bendel, busoni, wagner
+     excludehosts: bendel, busoni, wagner
  
   ###
    #-
@@@ -1713,15 -1718,6 +1718,6 @@@
      hostgroups: computers
      excludehostgroups: heavy-postfix, heavy-exim
   ###
-   -
-     name: process - amavis - master
-     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd (master)'"
-     hosts: liszt
-   -
-     name: process - amavis - all
-     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd '"
-     hosts: liszt
-     depends: process - amavis - master
    -
      name: process - amavis - master
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd-new (master)'"
@@@ -1737,7 -1733,6 +1733,6 @@@
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
      hostgroups: computers
      excludehostgroups: amavis-hosts
-     excludehosts: liszt
   ###
    -
      name: process - weightd - master
@@@ -1809,17 -1804,6 +1804,6 @@@
      hostgroups: postfix-hosts
      depends: process - postfix - master
  
-   -
-     name: process - postfix - smtpd
-     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:150 -c 0:200 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-     hosts: liszt
-     depends: process - postfix - master
-   -
-     name: process - postfix - smtp
-     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:350 -c 0:500 -u postfix -C smtp -a 'smtp -t unix -u -c'"
-     hosts: liszt
-     depends: process - postfix - master
- 
   ###
    -
      name: network service - smtp
@@@ -2008,12 -1992,12 +1992,12 @@@
      nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
      normal_check_interval: 120
      hostgroups: dl385, dl380, dl360, bl460, dl585
-     excludehosts: villa, lobos, liszt, senfl, schein
+     excludehosts: villa, lobos, senfl, schein
    -
      name: HW - hpasmcli status
      nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
      normal_check_interval: 120
-     hosts: villa, lobos, liszt
+     hosts: villa, lobos
    -
      name: HW - hpasmcli status
      nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
@@@ -2242,22 -2226,11 +2226,11 @@@
      excludehostgroups: bind9-hosts
  
   ####
-   -
-     name: process - vsftp - listener
-     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
-     hostgroups: ftpd-hosts, uploadqueue
-     excludehosts: klecker
-   -
-     name: process - vsftp - instance
-     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
-     hostgroups: ftpd-hosts, uploadqueue
-     excludehosts: klecker
    -
      name: network service - ftp
      check: check_ftp
-     hostgroups: ftpd-hosts, uploadqueue
+     hostgroups: uploadqueue, security_mirror
      excludehosts: klecker
-     depends: process - vsftp - listener
    -
      name: network service - ftp
      check: check_ftp
@@@ -2295,7 -2268,7 +2268,7 @@@
      name: unwanted process - postresql
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
      hostgroups: computers
-     excludehostgroups: postgres90-hosts, postgres84-hosts, postgres83-hosts
+     excludehostgroups: postgres90-hosts, postgres84-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'"
@@@ -2304,10 -2277,6 +2277,6 @@@
      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: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'"
@@@ -2344,7 -2313,7 +2313,7 @@@
      name: process - stunnel4 - puppet-ekeyd
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
      hostgroups: squeeze, wheezy
-     excludehosts: fano, fasch, field, finzi
+     excludehostgroups: freebsd
   ####
    -
      name: process - UPS - nut usbhid-ups - ups1