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

diff --combined config/nagios-master.cfg
index d84bdec,a6325dd..5f1709c
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -1953,11 -1953,6 +1953,11 @@@ services
      nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
      hostgroups: computers
      excludehosts: vasks, wagner
 +    excludehostgroups: armhf
 +  -
 +    name: process - monit
 +    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
 +    hostgroups: armhf
    -
      name: RAID - arrayprobe
      servicegroups: raid
@@@ -2438,6 -2433,12 +2438,12 @@@
      hostgroups: buildd
      excludehosts: fano, fasch, field, finzi
      contact_groups: buildd
+  ####
+   -
+     name: network service - gobby
+     check: check_tcp!6523
+     hosts: gombert
+     contact_groups: gobby
  
   ###
    #-