do not run apt checks on testing/unstable machines

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index dd211ba..9bdaefc 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -831,27 +831,27 @@ servers:
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, porterbox
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, porterbox
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
   hasse:
     address: 217.140.96.68
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
   hebden:
     address: 217.140.96.69
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
   henze:
     address: 217.140.96.70
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy
 
   poulenc:
     address: 144.32.168.77
@@ -948,6 +948,8 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
+  wheezy:
+    alias: Hosts running wheezy
 
   lenny:
     alias: Hosts running lenny
@@ -1301,6 +1303,7 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
+    excludehostsgroups: wheezy
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1829,7 +1832,7 @@ services:
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
     excludehosts: vasks, wagner
-    hostgroups: unbound-hosts, squeeze
+    hostgroups: unbound-hosts, squeeze, wheezy
  ###
   -
     name: process - uptimed
@@ -2314,7 +2317,7 @@ services:
   -
     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
+    hostgroups: squeeze, wheezy
     excludehosts: fano, fasch, field, finzi
  ####
   -