X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a0dc1236306e0d32d6364b496dbcd657ae6f5ece;hb=dd853778deccc221b6d2e9246812f248e2145d9a;hp=60e7de336d362374a5f584ff938e28ca432c7375;hpb=2260f2817fcdb4c095176da23ca4d52868751c56;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 60e7de3..a0dc123 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -119,6 +119,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: lfilipoz
+  gw-ubcnew:
+    address: 206.12.19.254
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+    contacts: lfilipoz
   gw-carnet:
     address: 161.53.160.1
     parents: gw-HP-ftc
@@ -201,7 +206,7 @@ servers:
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
+    hostgroups: computers, buildd, hasbootfs, lenny, single-cpu
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -477,8 +482,8 @@ servers:
     hostgroups: computers, buildd, hasbootfs, lenny
     contacts: lfilipoz
   ravel:
-    address: 137.82.84.66
-    parents: gw-ubc
+    address: 206.12.19.5
+    parents: gw-ubcnew
     hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts
   dijkstra:
     address: 137.82.84.70
@@ -487,7 +492,7 @@ servers:
   luchesi:
     address: 137.82.84.78
     parents: gw-ubc
-    hostgroups: computers, bl460, acpid-hosts, lenny
+    hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
   wolkenstein:
     address: 137.82.84.89
     parents: dijkstra
@@ -1622,18 +1627,6 @@ services:
     depends: kassia:process - apache2 - master
     hosts: kassia-sec, kassia-ftp, kassia-volatile
 
-
-  # apache1 process on merkel
-  -
-    name: process - apache - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
-    hosts: merkel
-  -
-    name: process - apache - worker
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
-    hosts: merkel
-    depends: process - apache - master
-
   # keyserver on raff
   -
     name: network service - http keyserver