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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index de8f84f..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
@@ -455,7 +460,7 @@ servers:
     address: 130.89.149.226
     parents: kassia
     hostgroups: secondary-IPs
-  kassia4:
+  kassia-volatile:
     address: 130.89.149.227
     parents: kassia
     hostgroups: secondary-IPs
@@ -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
@@ -511,7 +516,7 @@ servers:
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
+    hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
   morricone:
     address: 137.82.84.81
     parents: gw-ubc
@@ -1195,7 +1200,7 @@ services:
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: heavy-exim
-    excludehosts: rietz, merkel, raff, powell
+    excludehosts: rietz, merkel, raff, powell, bellini
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1210,7 +1215,7 @@ services:
     hosts: liszt
     hostgroups: heavy-exim
     depends: process - spamd - master
-    excludehosts: rietz, merkel, raff
+    excludehosts: rietz, merkel, raff, bellini
   #
   -
     name: process - spamd - master
@@ -1230,7 +1235,7 @@ services:
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
-    hosts: merkel, raff
+    hosts: merkel, raff, bellini
 
  ###
   #-
@@ -1448,7 +1453,7 @@ services:
 
  ####
   -
-    name: "host's SSL cert"
+    name: "host SSL cert"
     nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi"
     hostgroups: computers
 
@@ -1620,19 +1625,7 @@ services:
     name: network service - http
     check: check_http
     depends: kassia:process - apache2 - master
-    hosts: kassia-sec, kassia-ftp
-
-
-  # 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
+    hosts: kassia-sec, kassia-ftp, kassia-volatile
 
   # keyserver on raff
   -