X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=585386c8a823ad3794eb4ebc4ef36cbc4c33d109;hb=2455c4d6396868fbb4b25d990d1cc8bee18dbe4c;hp=630760446358d3c01c27685194d9705b52b4c69b;hpb=c52cf8d1190f744101fe52aa0e66c299b6bc0014;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 6307604..585386c 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -29,7 +29,7 @@ servers:
     contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
-    parents: samosa
+    parents: spohr
     hostgroups: routing-infrastructure
   gw-brainfood:
     address: 70.103.162.1
@@ -171,41 +171,45 @@ servers:
     hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet
   raff:
     address: 192.25.206.59
-    parents: samosa
+    parents: spohr
     hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, puppet
   gluck:
     address: 192.25.206.10
-    parents: samosa
+    parents: spohr
     hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, puppet
   merkel:
     address: 192.25.206.16
-    parents: samosa
+    parents: spohr
     hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
   spohr:
     address: 192.25.206.33
-    parents: samosa
+    parents: spohr
     hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, puppet
+  spohr2:
+    address: 140.211.166.38
+    parents: rietz
+    hostgroups: secondary-IPs
   peri:
     address: 192.25.206.15
-    parents: samosa
+    parents: spohr
     hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
     contacts: dannf
   penalosa:
     address: 192.25.206.68
-    parents: samosa
+    parents: spohr
     hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
     contacts: dannf
   mundy:
     address: 192.25.206.62
-    parents: samosa
+    parents: spohr
     hostgroups: computers, buildd, lenny, puppet
   paer:
     address: 192.25.206.11
-    parents: samosa
+    parents: spohr
     hostgroups: computers, porterbox, lenny, hasbootfs, puppet
   merulo:
     address: 192.25.206.58
-    parents: samosa
+    parents: spohr
     hostgroups: computers, porterbox, lenny, puppet
 
   bartok:
@@ -1519,7 +1523,7 @@ services:
     name: process - nagios3
     # there is always one extra process per check currently running..
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
-    hosts: samosa
+    hosts: spohr
 
  ###
   -
@@ -1574,9 +1578,22 @@ services:
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa, ries, klecker
+    hosts: samosa, ries, klecker, spohr2
     depends: network service - https
     normal_check_interval: 60
+
+  # spohr
+  -
+    name: network service - https
+    check: check_https
+    hosts: spohr2
+    depends: "spohr:process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - http
+    check: check_http
+    hosts: spohr2
+    depends: "spohr:process - apache2 - master"
  ####
   -
     name: process - named