X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=eca670ba6d4c9400036e75ac1f57bc56e9ce6248;hb=33832dc94149fc102f625057bdfc16a74be598d2;hp=c9f4a76dacbb2e2a37df64763b591946df34dd16;hpb=21b9b5c52beb36cd0dbf6725cd25717a3cb82c02;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c9f4a76..eca670b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -234,7 +234,7 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, hassrvfs, ulogd-hosts
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
@@ -292,12 +292,12 @@ 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.4
+    address: 128.148.34.3
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, ulogd-hosts
 
   mayer:
     address: 140.211.166.78
@@ -566,7 +566,7 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
-    hostgroups: computers
+    hostgroups: computers, porterbox, ulogd-hosts
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
@@ -604,7 +604,7 @@ servers:
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts
+    hostgroups: computers, porterbox, hassrvfs, xinetd-hosts, ulogd-hosts
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
@@ -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,6 +1623,12 @@ services:
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: franck
+  -
+    name: RAID - arrayprobe
+    servicegroups: raid
+    nrpe: "sudo /usr/bin/arrayprobe -f /dev/cciss/c1d0"
+    hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -1899,6 +1911,7 @@ services:
     name: process - postresql84 - 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'"
     hostgroups: postgres84-hosts
+    excludehosts: franck
   -
     name: process - postresql83 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
@@ -1914,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