X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=7739062e7dfb6633cce174675d997232f8f3309e;hb=6ee4f014df58012aa50841443d6ca5d22ad405a6;hp=1605f6e4c9fae764d505c3c8b596667baaa1026a;hpb=83ecabe23b59067726041bd69878a4ada4ab5574;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1605f6e..7739062 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -211,11 +211,11 @@ servers:
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasbootfs, hashomefs
+    hostgroups: computers, porterbox, hasbootfs, hashomefs, ulogd-hosts
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasusrfs
+    hostgroups: computers, porterbox, hasusrfs, ulogd-hosts
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
@@ -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,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
@@ -383,13 +383,13 @@ servers:
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs
+    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, ulogd-hosts
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers, ulogd-hosts
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
@@ -439,7 +439,7 @@ servers:
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, ulogd-hosts
 
   caballero:
     address: 193.201.200.200
@@ -449,7 +449,7 @@ servers:
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, smart, hasorgfs
+    hostgroups: computers, porterbox, smart, hasorgfs, ulogd-hosts
 
   kassia:
     address: 130.89.149.224
@@ -514,7 +514,7 @@ servers:
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
+    hostgroups: computers, hasbootfs, hassrvfs, apache2-hosts, kvmdomains, ulogd-hosts
   valente:
     address: 206.12.19.112
     parents: dijkstra
@@ -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
@@ -678,7 +678,7 @@ servers:
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, ulogd-hosts
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -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
@@ -1915,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