X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=473b55c117a25d1192ad514ecf3c61c2d304a323;hb=7c593dc0096c577aa21413506b68fff8af9d28d8;hp=7fbdcfbfcfd2d96061e73c5e5467c8151b2de73e;hpb=668822367b85cce58d75d45742165638864516b9;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 7fbdcfb..473b55c 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -153,6 +153,10 @@ servers:
     address: 213.188.99.215
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-isc:
+    address: 149.20.20.1 
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -338,7 +342,7 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny puppet
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, puppet
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
@@ -494,6 +498,11 @@ servers:
     parents: gw-cst
     hostgroups: computers, single-cpu, hasbootfs, lenny
 
+  schein:
+    address: 149.20.20.6
+    parents: gw-isc
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, acpid-hosts, lenny, rsyslog-hosts, puppet
+
 #############################
 # host groups
 #
@@ -721,7 +730,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -832,7 +841,7 @@ services:
   -
     name: samhain
     servicegroups: samhain
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-samhain -t 45"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
     excludehostgroups: no-samhain
     depends: process - samhain