X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=97de2a6fd1ceb910dd7c87a8992bd30d7e206215;hb=d3c1e7449453d6d2a1dec05a33220f1920771e43;hp=f83c265cabfc73990e89c3521f9a92c60ee73dfd;hpb=cb179418bf99382575402277fbb0d2b6b4307cb3;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f83c265..97de2a6 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -368,7 +368,7 @@ servers:
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, postgres94-hosts, postgres96-hosts, systemd-timesyncd
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -442,7 +442,7 @@ servers:
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
@@ -509,7 +509,7 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-systemd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-cecsit
@@ -531,11 +531,11 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
-  aagaard:
+  conova-node01:
     address: 217.196.149.227
     parents: gw-conova
     hostgroups: computers, stretch, service, sw-raid
-  acker:
+  conova-node02:
     address: 217.196.149.228
     parents: gw-conova
     hostgroups: computers, stretch, service, sw-raid
@@ -546,7 +546,7 @@ servers:
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
-    hostgroups: computers, stretch, service, apache2-hosts
+    hostgroups: computers, stretch, service, apache2-hosts, apache-https
   mirror-conova-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -680,13 +680,17 @@ servers:
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
-    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd, postgres96-hosts
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts
+  static-master-grnet-01:
+    address: 194.177.211.209
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, hassrvfs
   # }}}
   # {{{ gw-isc
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, security_mirror
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
@@ -1011,7 +1015,7 @@ servers:
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts
 
   rachmaninoff:
     address: 209.87.16.20
@@ -1171,7 +1175,7 @@ servers:
   henze:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
   hasse:
     address: 144.32.168.75
     parents: gw-ynic
@@ -1180,18 +1184,6 @@ servers:
     address: 144.32.168.76
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, stretch, buildd
-  #antheil:
-  #  address: 217.140.96.60
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
-  #hasse:
-  #  address: 217.140.96.68
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
-  #henze:
-  #  address: 217.140.96.70
-  #  parents: gw-arm
-  #  hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
   # }}}
   # {{{ gw-zivit
   zandonai:
@@ -2078,6 +2070,7 @@ services:
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: stretch
+    excludehosts: storace
   -
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
@@ -2678,6 +2671,14 @@ services:
     max_check_attempts: 5
     retry_interval: 5
     servicegroups: mirror
+  -
+    name: mirror sync - debian archive backend
+    check: "dsa_check_mirrorsync!debian.backend.mirrors.debian.org!debian/project/trace/master"
+    hosts: global
+    check_interval: 15
+    max_check_attempts: 5
+    retry_interval: 5
+    servicegroups: mirror
 
   -
     name: mirror static sync - bits