X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0e8e9057c0eb107febcb60f3d3c9763c88967563;hb=93e33efad7148ad5115ec693a63b238ac557df14;hp=6c4f7cc45826f9b19f60a8058c732f0876737034;hpb=45e68b452e8a36ea46ed7d85ba72302143ef538b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 6c4f7cc..0e8e905 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -19,11 +19,6 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
-  gw-1und1:
-    parents: gw-ubcece
-    hostgroups: notacomputer
-    pingable: false
-    check_command: dsa_check_always_ok
   gw-1und1-sec:
     parents: gw-ubcece
     hostgroups: notacomputer
@@ -82,11 +77,11 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-isc:
-    address: 149.20.20.1
+    address: 149.20.4.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-karlsruhe:
-    address: 129.143.57.177
+    address: 129.143.59.214
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-leaseweb:
@@ -166,16 +161,6 @@ servers:
     hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
-  # {{{ gw-1und1
-  powell:
-    address: 87.106.64.223
-    parents: gw-1und1
-    hostgroups: computers, service, jessie
-  pkgmirror-1and1:
-    address: 213.165.95.4
-    parents: powell
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
-  # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
@@ -276,11 +261,11 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, dl380, hpnewraid, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, hpnewraid, rsyncd-hosts, xinetd-hosts, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -343,7 +328,7 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts, systemd-timesyncd
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -351,33 +336,33 @@ 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
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie
+    hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   binet:
     address: 5.153.231.8
     parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd
   ganeti-bytemark:
     address: 82.195.75.111
     parents: gw-bytemark
@@ -385,39 +370,39 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts, systemd-timesyncd
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   rapoport:
     address: 5.153.231.15
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts, systemd-timesyncd
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
   moszumanska:
     address: 5.153.231.21
     parents: ganeti-bytemark
@@ -427,82 +412,82 @@ servers:
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ticharich:
     address: 5.153.231.23
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost
+    hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https
+    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd
   olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie
+    hostgroups: computers, kvmdomains, jessie, systemd-timesyncd
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, no-bacula
+    hostgroups: computers, kvmdomains, jessie, no-bacula, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd
   fede:
     address: 5.153.231.37
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd
   pinel:
     address: 5.153.231.42
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim, systemd-timesyncd
   rusca:
     address: 5.153.231.43
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
   manziarly:
     address: 5.153.231.44
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -515,7 +500,7 @@ servers:
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, apache-https
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -523,13 +508,21 @@ servers:
   mirror-anu3:
     address: 150.203.164.61
     parents: mirror-anu
-    hostgroups: secondary-IPs
+    hostgroups: secondary-IPs, security_mirror
   mirror-anu4:
     address: 150.203.164.62
     parents: mirror-anu
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
+  aagaard:
+    address: 217.196.149.227
+    parents: gw-conova
+    hostgroups: computers, jessie, service, sw-raid
+  acker:
+    address: 217.196.149.228
+    parents: gw-conova
+    hostgroups: computers, jessie, service, sw-raid
   # }}}
   # {{{ gw-csail
   steffani:
@@ -561,27 +554,31 @@ servers:
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
-    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, apache2-hosts, rsyncd-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
   httpredir-csail-01:
     address: 128.31.0.66
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https, systemd-timesyncd
   pkgmirror-csail:
     address: 128.31.0.51
     parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs, systemd-timesyncd
+  usper:
+    address: 128.31.0.69
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts, queued, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -644,6 +641,10 @@ servers:
     address: 194.177.211.207
     parents: ganeti-grnet
     hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
+  melartin:
+    address: 194.177.211.208
+    parents: ganeti-grnet
+    hostgroups: computers, service, kvmdomains, jessie
   # }}}
   # {{{ gw-isc
   schein:
@@ -651,19 +652,19 @@ servers:
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
   mirror-isc:
-    address: 149.20.20.7
+    address: 149.20.4.13
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
   mirror-isc2:
-    address: 149.20.20.19
+    address: 149.20.4.14
     parents: mirror-isc
     hostgroups: secondary-IPs
   mirror-isc3:
-    address: 149.20.20.22
+    address: 149.20.4.15
     parents: mirror-isc
     hostgroups: secondary-IPs
   mirror-isc-syncproxy:
-    address: 149.20.20.21
+    address: 149.20.4.16
     parents: mirror-isc
     hostgroups: secondary-IPs
   # }}}
@@ -943,14 +944,6 @@ servers:
     address: 206.12.19.23
     parents: sw-ubcece-kais
     hostgroups: notacomputer
-  tchaikovsky:
-    address: 206.12.19.118
-    parents: ganeti2
-    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
-  geo2:
-    address: 206.12.19.113
-    parents: ganeti2
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -963,60 +956,28 @@ servers:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  lotti:
-    address: 206.12.19.121
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
-  danzi:
-    address: 206.12.19.125
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, xinetd-hosts
-  tye:
-    address: 206.12.19.129
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs
-  jenko:
-    address: 206.12.19.133
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie
-  ullmann:
-    address: 206.12.19.141
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
-  sonntag:
-    address: 206.12.19.142
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
-  muffat:
-    address: 206.12.19.146
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
-  buxtehude:
-    address: 206.12.19.147
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
   # }}}
   # {{{ ubc-gateway
-  ubc-enc2bl1:
+  ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
-  ubc-enc2bl2:
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
-  ubc-enc2bl9:
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
   rachmaninoff:
     address: 209.87.16.20
     parents: ubc-gateway
@@ -1059,6 +1020,46 @@ servers:
     address: 209.87.16.29
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
+  danzi:
+    address: 209.87.16.30
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
+  geo2:
+    address: 209.87.16.31
+    parents: ubc-gateway
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+  lotti:
+    address: 209.87.16.32
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+  muffat:
+    address: 209.87.16.33
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
+  sonntag:
+    address: 209.87.16.34
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
+  tchaikovsky:
+    address: 209.87.16.35
+    parents: ubc-gateway
+    hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
+  gretchaninov:
+    address: 209.87.16.36
+    parents: ubc-gateway
+    hostgroups: computers, general, kvmdomains, jessie, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts
+  tye:
+    address: 209.87.16.37
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs
+  ullmann:
+    address: 209.87.16.38
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
+  buxtehude:
+    address: 209.87.16.39
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1220,6 +1221,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bl460g8:
+    alias: HP BL460 Gen8 blades
+    private: 1
   bm-bl:
     alias: HP blades at bytemark
     private: 1
@@ -1275,7 +1279,6 @@ hostgroups:
   bind9-hosts:
     alias: hosts running bind9
     private: 1
-  # once every host runs unbound, do away with this group and check "computers" instead
   amavis-hosts:
     alias: hosts running amavis
     private: 1
@@ -1300,6 +1303,9 @@ hostgroups:
   uploadqueue:
     alias: hosts that are an anonymous ftp uploadqueue
     private: 1
+  queued:
+    alias: hosts running queued
+    private: 1
   bosserver:
     alias: hosts running bosserver
     private: 1
@@ -1323,6 +1329,9 @@ hostgroups:
   autofs:
     alias: hosts running the automounter
     private: 1
+  systemd-timesyncd:
+    alias: Vms running systemd-timesyncd
+    private: 1
 
   highload:
     alias: "hosts on which high load is normal"
@@ -1543,6 +1552,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/morgue.debian.org"
     hosts: lw03
+  -
+    name: disk usage on /srv/QNAP-big/
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-big"
+    hosts: storace
+  -
+    name: disk usage on /srv/QNAP-tiny
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 80 /srv/QNAP-tiny"
+    hosts: storace
   # }}}
   # {{{ ### system
   # {{{ setup
@@ -1581,11 +1600,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
+    excludehosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo
   -
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
+    hosts: prokofiev, pieta, ubc-enc2bl01, ubc-enc2bl02, ubc-enc2bl09, ubc-enc2bl10, fasolo
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -1842,13 +1861,20 @@ services:
     name: process - ntpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
+    excludehostgroups: systemd-timesyncd
     servicegroups: time
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
+    excludehostgroups: systemd-timesyncd
     depends: process - ntpd
     servicegroups: time
+  -
+    name: system time synced
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl"
+    hostgroups: systemd-timesyncd
+    servicegroups: time
   ###
   -
     name: process - atd
@@ -2055,8 +2081,8 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
-    hostgroups: dl380, dl360, bl460, dl180
-    excludehosts: schein
+    hostgroups: dl380, dl360, bl460, bl460g8, dl180
+    excludehosts: schein, busoni
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2069,7 +2095,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein
+    hosts: schein, busoni
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2121,12 +2147,6 @@ services:
     check_interval: 120
     hosts: mirror-anu
   ###
-  -
-    name: RAID - 3ware
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
-    hosts: powell
-  ###
   -
     name: RAID - aacraid
     servicegroups: raid
@@ -2144,12 +2164,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
-    excludehosts: ubc-bl8
+    excludehosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   -
     name: RAID - DRBD
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All --ok-no-devices"
-    hosts: ubc-bl8
+    hosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2852,6 +2872,11 @@ services:
     hosts: global
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-statusfile /srv/dns.debian.org/var/nagios/ds"
     runfrom: denis
+  -
+    name: DNS - zones signed properly
+    hosts: global
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-signature-all"
+    runfrom: denis
   # }}}
   # {{{ storage
   -
@@ -2991,7 +3016,7 @@ services:
   -
     name: process - debianqueued
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak-unpriv -C debianqueued"
-    hostgroups: uploadqueue
+    hostgroups: queued
   ####
   -
     name: network service - gobby