X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ee584432609377eadeb0532d2f26b7b3eeb1d5d7;hb=d08a3cf536aadc116d1410377b785342da0ee43a;hp=ddd5659b40e5081a613bd558061cf4555384916d;hpb=d06afb60d0b069dba5d677447d2f7244062d96fe;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ddd5659..ee58443 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -190,7 +190,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   merkel:
     address: 192.25.206.16
     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, apache-https
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, bind9-hosts, squeeze
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -417,7 +417,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -1195,7 +1195,7 @@ services:
   -
     name: disk usage on /vicepa
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /vicepa"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
     hostgroups: hasvicepa
 
  ############ All Computers ############
@@ -1205,7 +1205,6 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    excludehostgroups: squeeze
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1772,6 +1771,7 @@ services:
     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
   -
     name: RAID - arrayprobe
     servicegroups: raid