X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=nagios-master.cfg;h=5b3eb09abe3321aa956c72d2ee8bc0e798ee11c4;hb=c8b9d17ed355b826cc191d822e8d5f7da86d8d1f;hp=0898ff3868a1165d385848d22f4d42dfd2622f86;hpb=8add54873b26cde0fcca42da6d96bc701805fa5a;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 0898ff3..5b3eb09 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -153,7 +153,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-isc:
-    address: 149.20.20.1 
+    address: 149.20.20.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-aca:
+    address: 130.239.18.97
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
 
@@ -273,7 +277,7 @@ servers:
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, lenny, puppet
+    hostgroups: computers, buildd, lenny, puppet, smart
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -304,7 +308,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny, puppet
 
   saens:
     address: 128.101.240.212
@@ -335,7 +339,7 @@ servers:
   raptor:
     address: 195.243.109.162
     parents: gw-topalis
-    hostgroups: computers, porterbox, postfix-hosts
+    hostgroups: computers, porterbox, postfix-hosts, lenny
 
   albeniz:
     address: 193.62.202.27
@@ -502,6 +506,11 @@ servers:
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360
 
+  praetorius:
+    address: 130.239.18.121
+    parents: gw-aca
+    hostgroups: computers, buildd, lenny, puppet
+
 #############################
 # host groups
 #
@@ -709,12 +718,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries
+    excludehosts: ries, klecker
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
-    hosts: ries
+    hosts: ries, klecker
   -
     name: disk usage on /boot
     servicegroups: diskspace