swraid on aagaard
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 0277dbd..e73b54a 100644 (file)
@@ -46,7 +46,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-cecsit:
-    address: 150.203.164.38
+    address: 150.203.164.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-arm:
@@ -57,10 +57,6 @@ servers:
     address: 138.16.160.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-carnet:
-    address: 161.53.160.1
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-conova:
     address: 217.196.149.238
     parents: gw-ubcece
@@ -105,6 +101,10 @@ servers:
     address: 82.195.75.126
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-man-da2:
+    address: 82.195.78.116
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-marist:
     address: 148.100.88.1
     parents: gw-ubcece
@@ -113,10 +113,6 @@ servers:
     address: 140.211.166.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-rapidswitch:
-    address: 193.201.200.129
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-sakura:
     address: 133.242.99.65
     parents: gw-ubcece
@@ -142,16 +138,12 @@ servers:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
     contacts: lfilipoz
-  gw-ugent:
-    address: 193.191.17.50
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-umn:
     address: 128.101.240.222
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-unicamp:
-    address: 143.106.167.234
+    address: 177.220.10.129
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-utwente:
@@ -164,7 +156,12 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-zivit:
-    address: 80.245.144.3
+    parents: gw-ubcece
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
+  ubc-gateway:
+    address: 209.87.16.254
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   # }}}
@@ -173,50 +170,33 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, acpid-hosts, jessie
-  pkgmirror-1and1:
-    address: 213.165.95.4
-    parents: powell
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
-  babin:
-    address: 213.165.95.6
-    parents: powell
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
-  piu-slave-1und1-01:
-    address: 213.165.95.7
-    parents: powell
-    hostgroups: computers, service, kvmdomains, jessie
-    contacts: holger
+    hostgroups: computers, service, jessie
   # }}}
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, jessie
-  chopin:
-    address: 195.20.242.124
-    parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
-  soler:
-    address: 195.20.242.126
-    parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, jessie, apache-https
+    hostgroups: computers, service, jessie
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, jessie, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, jessie, autofs, sw-raid
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, jessie, autofs, sw-raid
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
     hostgroups: computers, buildd, hassrvfs, jessie
   # }}}
   # {{{ gw-aql
+  eller:
+    address: 141.170.6.156
+    parents: gw-aql
+    hostgroups: computers, porterbox, jessie, hassrvfs
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
@@ -233,6 +213,10 @@ servers:
     address: 141.170.6.155
     parents: gw-aql
     hostgroups: computers, buildd, jessie, nfs-client
+  mips-aql-06:
+    address: 141.170.6.157
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs
   minkus:
     address: 141.170.6.151
     parents: gw-aql
@@ -245,6 +229,10 @@ servers:
     address: 141.170.6.153
     parents: gw-aql
     hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+  mipsel-aql-03:
+    address: 141.170.6.158
+    parents: gw-aql
+    hostgroups: computers, buildd, jessie, hassrvfs
   # }}}
   # {{{ gw-arm
   abel:
@@ -258,15 +246,15 @@ servers:
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
-  arm-arm-02:
-    address: 217.140.96.59
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
   arm-arm-03:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+  arm-arm-04:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -279,71 +267,79 @@ servers:
     address: 217.140.96.71
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd, broken_mq
-  ia64-arm-01:
-    address: 217.140.96.61
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd, broken_mq, sw-raid, acpid-hosts
   # }}}
   # {{{ gw-brown
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+  fasolo:
+    address: 138.16.160.17
+    parents: gw-brown
+    hostgroups: computers, service, dl380, hpnewraid, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl10:
     address: 5.153.231.250
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl11:
     address: 5.153.231.251
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl12:
     address: 5.153.231.252
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+  bm-bl13:
+    address: 5.153.231.253
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
+  bm-bl14:
+    address: 5.153.231.254
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
 
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-server, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts
   milanollo2:
     address: 5.153.231.9
     parents: milanollo
@@ -355,7 +351,7 @@ servers:
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
@@ -393,7 +389,7 @@ servers:
   philp:
     address: 5.153.231.13
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
@@ -405,7 +401,7 @@ servers:
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
@@ -435,11 +431,11 @@ servers:
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, apache2-hosts
-  oyens:
+    hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https
+  olin:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, openstack-controller, broken_mq, apache2-hosts # apache-https
+    hostgroups: computers, kvmdomains, jessie
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -448,10 +444,10 @@ servers:
     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
-  portman:
+  respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
@@ -459,7 +455,11 @@ servers:
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, acpid-hosts, no-bacula
+    hostgroups: computers, kvmdomains, jessie, no-bacula
+  tate:
+    address: 5.153.231.33
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
   gideon:
     address: 5.153.231.34
     parents: ganeti-bytemark
@@ -467,7 +467,7 @@ servers:
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -482,19 +482,23 @@ servers:
   jerea:
     address: 5.153.231.39
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https
   mekeel:
     address: 5.153.231.40
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs
-  pittar:
-    address: 5.153.231.41
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs #, apache2-hosts
   pinel:
     address: 5.153.231.42
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim
+  rusca:
+    address: 5.153.231.43
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+  manziarly:
+    address: 5.153.231.44
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -503,31 +507,29 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, jessie, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
-  # {{{ gw-carnet
-  lebrun:
-    address: 193.198.184.10
-    parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, wheezy
-  schroeder:
-    address: 193.198.184.11
-    parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, wheezy
-  # }}}
   # {{{ gw-cecsit
-  gluck:
-    address: 150.203.164.38
+  mirror-anu:
+    address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, jessie, security_mirror, no-bacula, 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
+    hostgroups: secondary-IPs
+  mirror-anu3:
+    address: 150.203.164.61
+    parents: mirror-anu
+    hostgroups: secondary-IPs, security_mirror
+  mirror-anu4:
+    address: 150.203.164.62
+    parents: mirror-anu
+    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
-  sompek:
-    address: 217.196.149.225
-    parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
-  stadler:
-    address: 217.196.149.226
+  aagaard:
+    address: 217.196.149.227
     parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
+    hostgroups: computers, jessie, service, sw-raid
   # }}}
   # {{{ gw-csail
   steffani:
@@ -538,11 +540,11 @@ servers:
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl360, jessie, drbd-hosts
   csail-node02:
     address: 128.31.0.46
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl360, jessie, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-bytemark
@@ -576,18 +578,22 @@ servers:
     address: 128.31.0.67
     parents: ganeti-csail
     hostgroups: computers, service, kvmdomains, hassrvfs, jessie, apache2-hosts, apache-https
+  pkgmirror-csail:
+    address: 128.31.0.51
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
   # }}}
   # {{{ gw-dgi
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, acpid-hosts, jessie, dl380, nfs-client, hassrvfs
+    hostgroups: computers, jessie, dl380, nfs-client, hassrvfs
   # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -597,15 +603,15 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, jessie, drbd-hosts
   grnet-node02:
     address: 194.177.211.196
     parents: gw-grnet
-    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
+    hostgroups: computers, service, dl380, jessie, drbd-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, jessie
+    hostgroups: computers, megaraid, service, jessie
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -629,39 +635,63 @@ servers:
   vittoria:
     address: 194.177.211.205
     parents: ganeti-grnet
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https
+  boott:
+    address: 194.177.211.206
+    parents: ganeti-grnet
     hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+  porta:
+    address: 194.177.211.207
+    parents: ganeti-grnet
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
   # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
+  mirror-isc:
+    address: 149.20.20.7
+    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
+    parents: mirror-isc
+    hostgroups: secondary-IPs
+  mirror-isc3:
+    address: 149.20.20.22
+    parents: mirror-isc
+    hostgroups: secondary-IPs
+  mirror-isc-syncproxy:
+    address: 149.20.20.21
+    parents: mirror-isc
+    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-leaseweb
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, acpid-hosts, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, jessie, dl180, nfs-server, rsyncd-hosts, xinetd-hosts
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
+    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, postgres94-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers,  service, jessie, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
   # }}}
   # {{{ gw-linaro
   arm-linaro-01:
@@ -685,19 +715,18 @@ servers:
     contacts: pkern
   # }}}
   # {{{ gw-man-da
-  # bartok TODO
   czerny:
     address: 82.195.75.109
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   clementi:
     address: 82.195.75.103
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
     parents: ganeti3
@@ -723,7 +752,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, jessie
   geo1:
     address: 82.195.75.105
     parents: ganeti3
@@ -735,11 +764,11 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, jessie, apache-https
   stockhausen:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, jessie, acpid-hosts
+    hostgroups: computers, service, kvmdomains, jessie
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -747,7 +776,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, jessie, apache-https, rsyncd-hosts, xinetd-hosts
   mailly:
     address: 82.195.75.114
     parents: ganeti3
@@ -759,11 +788,15 @@ servers:
   vogler:
     address: 82.195.75.92
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
   wolkenstein:
     address: 82.195.75.65
     parents: ganeti3
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, jessie
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
+  mips-manda-01:
+    address: 82.195.75.66
+    parents: gw-man-da
+    hostgroups: computers, buildd, jessie, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
@@ -772,6 +805,10 @@ servers:
     address: 82.195.75.74
     parents: gw-man-da
     hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
+  mipsel-manda-03:
+    address: 82.195.75.67
+    parents: gw-man-da
+    hostgroups: computers, buildd, jessie, hassrvfs
   seger:
     address: 82.195.75.93
     parents: ganeti3
@@ -787,15 +824,17 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
+    hostgroups: computers, service, dl360, hassrvfs, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
+
   byrd:
-    address: 140.211.166.20
+    address: 140.211.166.200
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, acpid-hosts, jessie
-  buxtehude:
-    address: 140.211.166.26
+    hostgroups: computers, service, dl380, jessie
+  beach:
+    address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, rsyncd-hosts, apache-https
+
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
@@ -812,67 +851,46 @@ servers:
     address: 140.211.166.198
     parents: pieta
     hostgroups: computers, jessie, hassrvfs, porterbox
-  # malo TODO
-#  mayr:
-#    address: 140.211.166.58
-#    parents: gw-osuosl
-#    hostgroups: computers, buildd, hasbootfs
-  merulo:
-    address: 140.211.166.46
-    parents: gw-osuosl
-    hostgroups: computers, porterbox, hasusrfs, wheezy
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
     hostgroups: computers, jessie, hassrvfs, porterbox, sw-raid
-  rietz:
-    address: 140.211.166.43
-    parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, jessie
-    #, bosserver
-  rietz2:
-    address: 140.211.166.44
-    parents: rietz
-    hostgroups: secondary-IPs
-  # zee TODO
-  # }}}
-  # {{{ gs-rapidswitch
-  caballero:
-    address: 193.201.200.200
-    parents: gw-rapidswitch
-    hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs, acpid-hosts
   # }}}
   # {{{ gw-sanger
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, xinetd-hosts, hasvarlogfs
+    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, xinetd-hosts, hasvarlogfs, multipath-hosts
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, sparc, wheezy
+    hostgroups: computers, sw-raid, sparc, wheezy, no-bacula
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-sil
-  eder:
-    address: 86.59.118.151
-    parents: gw-sil
-    hostgroups: computers, porterbox, jessie, hassrvfs
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
     hostgroups: computers, buildd, jessie, sw-raid
+  mips-sil-01:
+    address: 86.59.118.146
+    parents: gw-sil
+    hostgroups: computers, buildd, jessie, hassrvfs
+  mipsel-sil-01:
+    address: 86.59.118.147
+    parents: gw-sil
+    hostgroups: computers, buildd, jessie, hassrvfs
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -900,43 +918,31 @@ servers:
   ubc-bl7:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl6:
     address: 206.12.19.216
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl2:
     address: 206.12.19.212
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl3:
     address: 206.12.19.213
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl4:
     address: 206.12.19.214
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ubc-bl8:
     address: 206.12.19.218
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ganeti2:
     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
-  brahms:
-    address: 206.12.19.115
-    parents: ganeti2
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, 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
@@ -945,120 +951,156 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
-  fano:
-    address: 206.12.19.110
-    parents: ganeti2
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  finzi:
-    address: 206.12.19.111
-    parents: ganeti2
-    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
-    contacts: christoph
-  corelli:
-    address: 206.12.19.16
-    parents: sw-ubcece-kais
-    hostgroups: computers, buildd, jessie
-  lucatelli:
-    address: 206.12.19.15
-    parents: sw-ubcece-kais
-    hostgroups: computers, buildd, jessie
-  traetta:
-    address: 206.12.19.21
-    parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, jessie
 #  locke:
 #    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
-  nono:
-    address: 206.12.19.123
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs
-  reger:
-    address: 206.12.19.124
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim
-  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, wheezy, apache2-hosts, nfs-client, autofs, xinetd-hosts
-  tye:
-    address: 206.12.19.129
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, xinetd-hosts
+  jenko:
+    address: 206.12.19.133
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie
+  # }}}
+  # {{{ ubc-gateway
+  ubc-enc2bl1:
+    address: 209.87.16.1
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl2:
+    address: 209.87.16.2
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl9:
+    address: 209.87.16.9
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  ubc-enc2bl10:
+    address: 209.87.16.10
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
+  rachmaninoff:
+    address: 209.87.16.20
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie
+  x86-ubc-01:
+    address: 209.87.16.21
+    parents: ubc-gateway
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+  finzi:
+    address: 209.87.16.22
+    parents: ubc-gateway
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
+    contacts: christoph
+  fano:
+    address: 209.87.16.23
+    parents: ubc-gateway
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
+    contacts: christoph
   elgar:
-    address: 206.12.19.130
-    parents: ganeti2
+    address: 209.87.16.24
+    parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie
   gombert:
-    address: 206.12.19.132
-    parents: ganeti2
+    address: 209.87.16.25
+    parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https
-  jenko:
-    address: 206.12.19.133
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie
+  nono:
+    address: 209.87.16.26
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs
+  reger:
+    address: 209.87.16.27
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, heavy-exim
   diabelli:
-    address: 206.12.19.136
-    parents: ganeti2
+    address: 209.87.16.28
+    parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, broken_https_default_vhost
-  bizet:
-    address: 206.12.19.137
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-bacula
-  beach:
-    address: 206.12.19.140
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula, apache-https
-  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, wheezy, nfs-client, autofs
   menotti:
-    address: 206.12.19.143
-    parents: ganeti2
+    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: 206.12.19.146
-    parents: ganeti2
+    address: 209.87.16.33
+    parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
-  # }}}
-  # {{{ gw-ugent
+  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:
+  #saens:
+  #  address: 128.101.240.212
+  #  parents: gw-umn
+  #  hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+  mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+  mirror-umn2:
+    address: 128.101.240.215
+    parents: mirror-umn
+    hostgroups: secondary-IPs
+  mirror-umn3:
+    address: 128.101.240.216
+    parents: mirror-umn
+    hostgroups: secondary-IPs
+  mirror-umn4:
+    address: 128.101.240.217
+    parents: mirror-umn
+    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-unicamp
   prokofiev:
-    address: 143.106.167.147
+    address: 177.220.10.140
     parents: gw-unicamp
     hostgroups: computers, jessie, service
   powerpc-unicamp-01:
-    address: 143.106.167.149
+    address: 177.220.10.141
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
-    address: 143.106.167.135
+    address: 177.220.10.142
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, jessie
   plummer:
-    address: 143.106.167.146
+    address: 177.220.10.143
     parents: prokofiev
     hostgroups: computers, porterbox, hassrvfs, jessie
   # }}}
@@ -1066,7 +1108,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, xinetd-hosts, jessie, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1128,7 +1170,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror, acpid-hosts
+    hostgroups: computers, service, jessie, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, xinetd-hosts, security_mirror
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1170,12 +1212,12 @@ hostgroups:
   general:
     alias: general purpose developer accessible machines
 
+  hpnewraid:
+    alias: new (2015+) machines where we need hpssacli instead of hpacucli
+    private: 1
   dl380:
     alias: HP DL380 hosts
     private: 1
-  dl385:
-    alias: HP DL385 hosts
-    private: 1
   dl360:
     alias: HP DL360 hosts
     private: 1
@@ -1185,9 +1227,6 @@ hostgroups:
   bm-bl:
     alias: HP blades at bytemark
     private: 1
-  dl585:
-    alias: HP DL385 hosts
-    private: 1
   dl180:
     alias: HP DL180
     private: 1
@@ -1217,6 +1256,8 @@ hostgroups:
 
   drbd-hosts:
     alias: hosts running drbd
+  multipath-hosts:
+    alias: hosts running multipathd
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -1238,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
@@ -1304,15 +1344,9 @@ hostgroups:
   hasorgfs:
     alias: hosts with a /org filesystem
     private: 1
-  hasvarfs:
-    alias: hosts with a /var filesystem
-    private: 1
   hasvarlogfs:
     alias: hosts with a /var/log filesystem
     private: 1
-  hasusrfs:
-    alias: hosts with a /usr filesystem
-    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1332,9 +1366,9 @@ hostgroups:
   alioth:
     alias: machines that just are just awkward
     private: 1
-  openstack-compute:
-    alias: nodes that run OpenStack compute
-    private: 1
+  #openstack-compute:
+  #  alias: nodes that run OpenStack compute
+  #  private: 1
   openstack-controller:
     alias: nodes that run OpenStack controller
     private: 1
@@ -1368,6 +1402,8 @@ servicegroups:
   security:
     alias: security
     servicegroup_members: apt, kernel, samhain
+  mirror:
+    alias: mirror stuff
   MQ:
     alias: rabbitMQ stuff
 # }}}
@@ -1379,21 +1415,21 @@ services:
     check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
     excludehostgroups: layer3-infrastructure, high-RTT
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!600.0,20%!900.0,40%"
     hostgroups: high-RTT
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
     hostgroups: layer3-infrastructure
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   # }}}
@@ -1420,11 +1456,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hostgroups: hasbootfs
-  -
-    name: disk usage on /var
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hostgroups: hasvarfs
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -1435,21 +1466,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
     hostgroups: hassrvfs
-  -
-    name: disk usage on /tmp
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens
-  -
-    name: disk usage on /usr
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hostgroups: hasusrfs
   -
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: sibelius, busoni, buxtehude, lw07
+    hosts: sibelius, busoni, buxtehude, lw07, fasolo
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1499,7 +1520,7 @@ services:
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org"
-    hosts: franck
+    hosts: franck, fasolo
   -
     name: disk usage on /storage/snapshot-farm-1
     servicegroups: diskspace
@@ -1532,13 +1553,13 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
     excludehostgroups: alioth
   -
     name: setup - local hostname etc-hosts
     nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
   # }}}
   # {{{ os health
   ####
@@ -1563,11 +1584,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
-    excludehosts: prokofiev, pieta
+    excludehosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
   -
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
-    hosts: prokofiev, pieta
+    hosts: prokofiev, pieta, ubc-enc2bl1, ubc-enc2bl2, ubc-enc2bl9, ubc-enc2bl10
   -
     name: swap usage - percent
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20% -c 10%"
@@ -1605,7 +1626,7 @@ services:
   -
     name: system - filesystem check
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     hostgroups: computers
   # }}}
@@ -1615,16 +1636,16 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: backuphost, storace, backuphost
-    normal_check_interval: 60
+    excludehosts: backuphost, storace
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: backuphost, storace, backuphost
-    normal_check_interval: 60
+    hosts: storace
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
@@ -1634,7 +1655,7 @@ services:
     runfrom: dinis
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   -
     name: backup - bacula - last full backup
@@ -1643,8 +1664,13 @@ services:
     runfrom: dinis
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
+  -
+    name: process - bacula-dir
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-dir -a '/usr/sbin/bacula-dir -c /etc/bacula/bacula-dir.conf'"
+    hosts: dinis
   -
     name: process - bacula-fd
     servicegroups: backup
@@ -1669,15 +1695,20 @@ services:
     servicegroups: kernel
     nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
     retry_check_interval: 5
   -
     name: apt - security updates
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
+  -
+    name: unexpected file - apt sources.list
+    servicegroups: apt
+    nrpe: "/usr/lib/nagios/plugins/negate /usr/lib/nagios/plugins/dsa-check-file -f /etc/apt/sources.list"
+    hostgroups: computers
   -
     name: upgraded libraries
     servicegroups: security
@@ -1685,7 +1716,7 @@ services:
     #nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
     hostgroups: computers
     excludehostgroups: freebsd
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     notification_interval: 10080
   -
@@ -1724,7 +1755,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
     depends: process - samhain
-    normal_check_interval: 60
+    check_interval: 60
     retry_check_interval: 5
     excludehostgroups: brokensamhain
   -
@@ -1779,7 +1810,7 @@ services:
     check: dsa_check_ssh
     hostgroups: computers
     depends: process - sshd
-    normal_check_interval:  60
+    check_interval:  60
     notification_interval: 1440
   ####
   -
@@ -1797,18 +1828,13 @@ services:
   ###
   -
     name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
     hostgroups: computers
-    excludehostgroups: freebsd, armhf
+    excludehostgroups: freebsd
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
     hostgroups: freebsd
-  -
-    name: process - munin-node
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a 'munin-node'"
-    hostgroups: wheezy, jessie
-    excludehostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1859,7 +1885,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rainier
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     excludehostgroups: alioth, broken_mq
   -
@@ -1868,7 +1894,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rapoport
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     excludehostgroups: alioth, broken_mq
   ###
@@ -1876,7 +1902,7 @@ services:
     name: local resolver
     nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
   -
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
@@ -1907,6 +1933,7 @@ services:
     name: process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid'"
     hostgroups: acpid-hosts
+    excludehostgroups: jessie
   -
     name: unexpected process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
@@ -1934,6 +1961,11 @@ services:
     hostgroups: computers
     excludehostgroups: freebsd, alioth
     excludehosts: czerny, grnet-node01, storace, ubc-bl2
+  ###
+  -
+    name: process - rngd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd -a '/usr/sbin/rngd -r /dev/hwrng'"
+    hostgroups: kvmdomains
   # }}}
   # {{{ anti-services
   -
@@ -1948,7 +1980,7 @@ services:
     name: unwanted process - openvpn
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C openvpn"
     hostgroups: computers
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: unwanted process - gkrellmd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
@@ -1985,6 +2017,16 @@ 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
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-cert-expire-dir /etc/puppet/modules/ssl/files/from-letsencrypt"
+    runfrom: handel
   # }}}
   # {{{ HW health/raid
   -
@@ -2015,66 +2057,72 @@ services:
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
-    normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz
+    check_interval: 120
+    hostgroups: dl380, dl360, bl460, dl180
+    excludehosts: schein, busoni
+    excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: bm-bl
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
-    normal_check_interval: 120
-    hosts: schein, rietz
+    check_interval: 120
+    hosts: schein, busoni
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: franck
   -
-    name: HW - hpacucli status
+    name: HW - hpssacli status
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
-    normal_check_interval: 120
-    hostgroups: dl585
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
+    check_interval: 120
+    hostgroups: hpnewraid
   ###
 #  -
 #    name: HW - edac status
 #    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
-#    normal_check_interval: 120
+#    check_interval: 120
     #hostgroups: computers
     #excludehosts: villa, lobos, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
-    normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
-    excludehosts: villa, lobos, schein, storace
+    check_interval: 120
+    hostgroups: dl380, dl360, bl460, bm-bl
+    excludehosts: villa, lobos, schein, storace, mirror-anu
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: villa
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant  --ignore-failed='PS2'"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: storace
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present --ps-no-redundant --ignore-failed='PS1'"
+    check_interval: 120
+    hosts: mirror-anu
   ###
   -
     name: RAID - 3ware
@@ -2099,6 +2147,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
+    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-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2306,7 +2360,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    normal_check_interval: 120
+    check_interval: 120
   # }}}
   # {{{ mail - network service
   -
@@ -2360,7 +2414,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker, oyens
+    excludehosts: klecker
     depends: process - apache2 - master
   -
     name: network service - http
@@ -2383,31 +2437,31 @@ services:
     excludehosts: menotti
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
     hosts: menotti
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_any_status
     hostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
     hostgroups: apache-https
     depends: network service - https
-    normal_check_interval: 60
+    check_interval: 60
   -
     name: unwanted network service - https
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
     excludehostgroups: apache-https
-    normal_check_interval: 60
+    check_interval: 60
   # }}}
   # {{{ FTP
   -
@@ -2487,7 +2541,7 @@ services:
     nrpe: "(/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0 > /dev/null || /usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0) && /usr/lib/nagios/plugins/check_procs -a schroot -s ZNs -c 0"
     hostgroups: buildd
     contact_groups: +buildd
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 24
     retry_check_interval: 5
   -
@@ -2529,24 +2583,205 @@ services:
     name: mirror sync - bugs
     check: "dsa_check_mirrorsync_skew!bugs.debian.org!project/trace/bugs-master.debian.org!120:600"
     hosts: global
+    servicegroups: mirror
   -
     name: mirror sync - security
     check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
     hosts: global
+    servicegroups: mirror
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
     hosts: global
-    normal_check_interval: 15
+    check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
+    servicegroups: mirror
   -
     name: mirror sync - snapshot
     check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
     hosts: global
-    normal_check_interval: 15
+    check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
+    servicegroups: mirror
+
+  -
+    name: mirror static sync - bits
+    check: "dsa_check_staticsync!bits.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - network-test
+    check: "dsa_check_staticsync_nossl!network-test.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - appstream
+    check: "dsa_check_staticsync!appstream.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - blends
+    check: "dsa_check_staticsync!blends.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - d-i
+    check: "dsa_check_staticsync!d-i.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debaday
+    check: "dsa_check_staticsync!debaday.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debdeltas
+    check: "dsa_check_staticsync_nossl!debdeltas.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - dsa
+    check: "dsa_check_staticsync!dsa.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - lintian
+    check: "dsa_check_staticsync!lintian.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - mozilla
+    check: "dsa_check_staticsync_nossl!mozilla.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - news
+    check: "dsa_check_staticsync!news.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - incoming.ports
+    check: "dsa_check_staticsync_nossl!incoming.ports.debian.org"
+    hosts: global
+    servicegroups: mirror
+ # -
+ #   name: mirror static sync - release
+ #   check: "dsa_check_staticsync!release.debian.org"
+ #   hosts: global
+ #   servicegroups: mirror
+  -
+    name: mirror static sync - rtc
+    check: "dsa_check_staticsync!rtc.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - security-team
+    check: "dsa_check_staticsync!security-team.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - wnpp-by-tags
+    check: "dsa_check_staticsync!wnpp-by-tags.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - www.ports
+    check: "dsa_check_staticsync!www.ports.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - timeline
+    check: "dsa_check_staticsync!timeline.debian.net"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - backports
+    check: "dsa_check_staticsync!backports.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - incoming
+    check: "dsa_check_staticsync_nossl!incoming.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - metadata.ftp-master
+    check: "dsa_check_staticsync_nossl!metadata.ftp-master.debian.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - deb
+    check: "dsa_check_staticsync_nossl!deb.debian.org"
+    hosts: global
+    servicegroups: mirror
+
+  -
+    name: mirror static sync - 10years
+    check: "dsa_check_staticsync!10years.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf0
+    check: "dsa_check_staticsync!debconf0.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf1
+    check: "dsa_check_staticsync!debconf1.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf2
+    check: "dsa_check_staticsync!debconf2.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf3
+    check: "dsa_check_staticsync!debconf3.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf4
+    check: "dsa_check_staticsync!debconf4.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf5
+    check: "dsa_check_staticsync!debconf5.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf6
+    check: "dsa_check_staticsync!debconf6.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf7
+    check: "dsa_check_staticsync!debconf7.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - debconf1
+    check: "dsa_check_staticsync!debconf1.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - es
+    check: "dsa_check_staticsync!es.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - fr
+    check: "dsa_check_staticsync!fr.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - miniconf10
+    check: "dsa_check_staticsync!miniconf10.debconf.org"
+    hosts: global
+    servicegroups: mirror
   # }}}
   # {{{ DNS
   -
@@ -2627,7 +2862,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
     runfrom: ubc-bl8
     hosts: giustini
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
@@ -2637,16 +2872,26 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10867 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
+  ###
+  -
+    name: process - multipathd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u root -C multipathd -a '/sbin/multipathd'"
+    hostgroups: multipath-hosts
+  -
+    name: unwanted process - multipathd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C multipathd"
+    hostgroups: computers
+    excludehostgroups: multipath-hosts
   # }}}
   # {{{ porterbox
   -
     name: current chroots
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dchroots-current"
     hostgroups: porterbox
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   # }}}
   # {{{ openstack
@@ -2662,10 +2907,10 @@ services:
 #    name: process - openstack - nova-api
 #    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-api -a '/usr/bin/python /usr/bin/nova-api --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-api.log'"
 #    hostgroups: openstack-controller
-  -
-    name: process - openstack - nova-compute
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-compute -a '/usr/bin/python /usr/bin/nova-compute --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-compute.log --config-file=/etc/nova/nova-compute.conf'"
-    hostgroups: openstack-compute
+#  -
+#    name: process - openstack - nova-compute
+#    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-compute -a '/usr/bin/python /usr/bin/nova-compute --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-compute.log --config-file=/etc/nova/nova-compute.conf'"
+#    hostgroups: openstack-compute
 #  -
 #    name: process - openstack - nova-cert
 #    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-cert -a '/usr/bin/python /usr/bin/nova-cert --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-cert.log'"
@@ -2698,11 +2943,6 @@ services:
     hostgroups: jessie
     excludehostgroups: freebsd
   ###
-  -
-    name: process - rngd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rngd  -a '/usr/sbin/rngd -r /dev/hwrng'"
-    hostgroups: dl385
-  ###
   -
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
@@ -2711,7 +2951,7 @@ services:
     name: network service - ldaps cert
     check: dsa_check_cert!636
     depends: process - slapd
-    normal_check_interval: 60
+    check_interval: 60
     hosts: draghi
   ###
   -
@@ -2725,17 +2965,26 @@ services:
     check: check_tcp!873
     hostgroups: rsyncd-hosts
     depends: process - xinetd
-    excludehosts: rietz
   -
     name: network service - rsync
     check: check_tcp!873
-    hosts: rietz2
-    depends: rietz:process - xinetd
+    hosts: milanollo2
+    depends: milanollo:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
-    hosts: milanollo2
-    depends: milanollo:process - xinetd
+    hosts: mirror-isc2, mirror-isc-syncproxy
+    depends: mirror-isc:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: mirror-umn2, mirror-umn3
+    depends: mirror-umn:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: mirror-anu2, mirror-anu3
+    depends: mirror-anu:process - xinetd
   ###
   -
     name: process - icinga
@@ -2756,19 +3005,19 @@ services:
   -
     name: network service - sip-tls cert - 443
     check: dsa_check_cert!443
-    normal_check_interval: 60
+    check_interval: 60
     hosts: vogler
   -
     name: network service - sip-tls cert - 5061
     check: dsa_check_cert!5061
-    normal_check_interval: 60
+    check_interval: 60
     hosts: vogler
   ####
   -
     name: puppetmaster cert
     nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
     hosts: handel
-    normal_check_interval: 60
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   # }}}