X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=a0b1fec2262df51c1698d8f6c89fbbd35ee8fe4e;hb=f3e38b48d2b05a7d74bf46894152aad4c984bbb3;hp=e5e52c7bbf3d514baf97fd2d9168fa4d29187cd8;hpb=17789ed68a2daeeac4487299a3f022221edd875b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index e5e52c7..a0b1fec 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
@@ -378,7 +378,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts
 
   saens:
     address: 128.101.240.212
@@ -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
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -547,11 +547,7 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server
-  cimarosa:
-    address: 206.12.19.8
-    parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, service
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, ftpd-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -1199,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 ############
@@ -1209,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
  ####
@@ -1776,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