X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=cf34271f902cd30ec027348b4058bf6ccfb35177;hb=44644ad5247016305360ecd5e53944a0c6830f96;hp=92f08c23ddc1ccca2417a527f0a91d4063eb823d;hpb=d11fea21c1b5c26efbfc58004a9a5807a0036efb;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 92f08c2..cf34271 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -482,11 +482,10 @@ servers:
     address: 130.89.149.227
     parents: kassia
     hostgroups: secondary-IPs
-  
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -832,27 +831,27 @@ servers:
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, porterbox
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
   hasse:
     address: 217.140.96.68
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
   hebden:
     address: 217.140.96.69
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
   henze:
     address: 217.140.96.70
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze
+    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
@@ -949,6 +948,8 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
+  wheezy:
+    alias: Hosts running wheezy
 
   lenny:
     alias: Hosts running lenny
@@ -1302,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
  ####
@@ -1491,12 +1493,15 @@ services:
     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: freebsd
-    excludehosts: vasks, wagner
+    excludehosts: vasks, wagner, harris, hartmann, hasse, henze, hebden, hoiby
   -
     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: freebsd
-    excludehosts: vasks, wagner
+  -
+    name: process - munin-node
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
+    hosts: harris, hartmann, hasse, henze, hebden, hoiby
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1545,7 +1550,6 @@ services:
     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: freebsd
-    excludehosts: vasks, wagner
 
   -
     name: remote logging
@@ -1826,7 +1830,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
@@ -1904,13 +1908,6 @@ 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
-  -
-    name: process - cpqarrayd
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehostgroups: squeeze
-    excludehosts: wagner
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -2311,7 +2308,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
  ####
   -