move lw0[78] to stretch

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 943e6ee..185fb90 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -85,10 +85,6 @@ servers:
     address: 72.52.94.70
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-karlsruhe:
-    address: 129.143.59.214
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-leaseweb:
     address: 185.17.185.190
     parents: gw-ubcece
@@ -447,7 +443,7 @@ servers:
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, no-bacula, systemd-timesyncd
+    hostgroups: computers, pybuildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
@@ -687,27 +683,27 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, postgres96-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers, service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
   lw09:
     address: 185.17.185.181
     parents: gw-leaseweb
@@ -717,13 +713,6 @@ servers:
     parents: gw-leaseweb
     hostgroups: computers, service, stretch, dl180
   # }}}
-  # {{{ gw-karlsruhe
-  zemlinsky:
-    address: 129.143.160.6
-    parents: gw-karlsruhe
-    hostgroups: computers, buildd, stretch
-    contacts: pkern
-  # }}}
   # {{{ gw-manda
   czerny:
     address: 82.195.75.109
@@ -851,7 +840,7 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts
+    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts, apache2-hosts
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -1000,6 +989,14 @@ servers:
     address: 209.87.16.46
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
+  kantuser:
+    address: 209.87.16.47
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts
+  grabbe:
+    address: 209.87.16.48
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1969,11 +1966,6 @@ services:
     name: "sso CRL"
     nrpe: "if [ -e /var/lib/dsa/sso/ca.crl ]; then /usr/lib/nagios/plugins/dsa-check-crl-expire -w 129600 -c 86400 /var/lib/dsa/sso/ca.crl; else echo 'No sso/ca.crl on this host.'; fi"
     hostgroups: computers
-  -
-    name: SSL certs - puppet
-    hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/servicecerts"
-    runfrom: handel
   -
     name: SSL certs - LE
     hosts: global