X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=9389c52bb900b7577ba611ccc4ec20081fed2f79;hb=53aaa05aca189b035d88e5e11cee90989486473d;hp=a96bdaff4fa71fc93e6b7b44b4eea06b88a488e7;hpb=d79935e879cc56743bc663428e6c718ffa095900;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a96bdaf..9389c52 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -292,7 +292,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, xinetd-hosts
 
   franck:
     address: 128.148.34.3
@@ -1124,6 +1124,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: computers
 
+ ####
+  -
+    name: installed firewall
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
+    hostgroups: computers
+
  ####
   -
     name: process - samhain
@@ -1617,7 +1623,7 @@ services:
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460
-    ignorehosts: franck
+    excludehosts: franck
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1921,11 +1927,11 @@ services:
   -
     name: process - postresql84 - dak master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-    hosts: franck, ries
+    hosts: franck
   -
     name: process - postresql84 - dak-dev master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
-    hosts: franck, ries
+    hosts: franck
  # backups
   -
     name: postgresql backups