Add merkel2 host, fix parent for spohr2; add spohr and merkel2 to https cert age

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 70a7205..b790679 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -186,12 +186,16 @@ servers:
     address: 192.25.206.16
     parents: spohr
     hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+  merkel2:
+    address: 192.25.206.71
+    parents: merkel
+    hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
     hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim
   spohr2:
     address: 192.25.206.38
-    parents: rietz
+    parents: spohr
     hostgroups: secondary-IPs
   peri:
     address: 192.25.206.15
@@ -1620,7 +1624,13 @@ services:
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: ries, klecker, spohr2, draghi
+    # ries             ftp-master.debian.org
+    # klecker          security-master.debian.org
+    # spohr            rt.debian.org
+    # spohr2           nagios.debian.org
+    # draghi           db.debian.org
+    # merkel2          nm.debian.org
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2
     depends: network service - https
     normal_check_interval: 60
 
@@ -1636,6 +1646,18 @@ services:
     check: check_http
     hosts: spohr2
     depends: "spohr:process - apache2 - master"
+  # merkel
+  -
+    name: network service - https
+    check: check_https
+    hosts: merkel2
+    depends: "merkel:process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - http
+    check: check_http
+    hosts: merkel2
+    depends: "merkel:process - apache2 - master"
  ####
   -
     name: process - named