X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=99e8f9ef250123a0e1e1e86f622c48c5fcc43e51;hb=50d24797b2a095b2043643d6a9a4b230eba71d20;hp=4295933bc78e8bf9de00128a81c81941d4fe796f;hpb=d5a1f7223d1b81753954ebe102c18b5be8989a9e;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4295933..99e8f9e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -342,7 +342,7 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
@@ -454,7 +454,7 @@ servers:
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
@@ -494,7 +494,7 @@ servers:
   rusca:
     address: 5.153.231.43
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
@@ -546,7 +546,7 @@ servers:
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
-    hostgroups: computers, stretch, service, apache2-hosts, apache-https
+    hostgroups: computers, stretch, service, apache2-hosts
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -561,7 +561,7 @@ servers:
     parents: mirror-conova
   mirror-conova-syncproxy4-eu:
     address: 217.196.149.237
-    hostgroups: secondary-IPs, rsyncd-hosts
+    hostgroups: secondary-IPs, rsyncd-hosts, https-service
     parents: mirror-conova
 
   arm-conova-01:
@@ -618,7 +618,7 @@ servers:
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
   usper:
     address: 128.31.0.69
     parents: ganeti-csail
@@ -1347,6 +1347,9 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  https-service:
+    alias: https service for secondary addresses
+    private: 1
   broken_https_default_vhost:
     alias: https default vhost does not say 200 OK
     private: 1
@@ -2499,6 +2502,12 @@ services:
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     check_interval: 120
+  -
+    name: network service - https
+    check: check_https
+    hostgroups: https-service
+    excludehostgroups: broken_https_default_vhost
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
@@ -2514,7 +2523,7 @@ services:
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hostgroups: apache-https
+    hostgroups: apache-https, https-service
     depends: network service - https
     check_interval: 60
   -