X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=eb56474fda579107777b4e454a5266ada540ae9f;hb=f8a07ee22a749cd23a0ae76447400d10f3d6c36f;hp=a267deddaa7b3d127683c712862d60a0df2ff3c6;hpb=3b3f578e3e089f2134b6c26e2a42d4aeb2ff2bf4;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index a267ded..eb56474 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
@@ -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, rsyslog-hosts, 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