X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a5d831b138775ed7ad84007261a7d9ad88d15bdd;hb=dd6195f7fb0fcd71f8ad705f20530aafb5b7f43e;hp=71839bdfcea2b9c3c7c89c68043537db1de8608a;hpb=7f4d92f42e2a2a925d1f9f629c075f0ad426dd73;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 71839bd..a5d831b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -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,10 +138,6 @@ 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
@@ -168,6 +160,10 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
+  ubc-gateway:
+    address: 209.87.16.254
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   # }}}
   # {{{ servers
   # {{{ gw-1und1
@@ -183,11 +179,6 @@ servers:
     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
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -210,10 +201,10 @@ servers:
     hostgroups: computers, buildd, hassrvfs, jessie
   # }}}
   # {{{ gw-aql
-  etler:
+  eller:
     address: 141.170.6.156
     parents: gw-aql
-    hostgroups: computers, porterbox, jessie, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, porterbox, jessie, hassrvfs
   mips-aql-01:
     address: 141.170.6.149
     parents: gw-aql
@@ -230,6 +221,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
@@ -242,6 +237,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:
@@ -255,15 +254,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
@@ -276,79 +275,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, 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, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, 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, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl11:
     address: 5.153.231.251
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl12:
     address: 5.153.231.252
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl13:
     address: 5.153.231.253
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    hostgroups: computers, bm-bl, service, jessie, multipath-hosts
   bm-bl14:
     address: 5.153.231.254
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, jessie
+    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
@@ -360,7 +359,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
@@ -398,7 +397,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
@@ -410,7 +409,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
@@ -440,11 +439,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
@@ -453,10 +452,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
@@ -476,7 +475,7 @@ servers:
   httpredir-bm-01:
     address: 5.153.231.35
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -496,10 +495,6 @@ servers:
     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
@@ -508,6 +503,10 @@ servers:
     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:
@@ -516,21 +515,7 @@ 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
-    parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
@@ -549,14 +534,6 @@ servers:
     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
-    parents: gw-conova
-    hostgroups: computers, buildd, hassrvfs, sw-raid, wheezy, sparc
   # }}}
   # {{{ gw-csail
   steffani:
@@ -605,6 +582,10 @@ 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:
@@ -659,6 +640,14 @@ servers:
     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:
@@ -668,13 +657,13 @@ servers:
   mirror-isc:
     address: 149.20.20.7
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+    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.19
+    address: 149.20.20.22
     parents: mirror-isc
     hostgroups: secondary-IPs
   mirror-isc-syncproxy:
@@ -779,7 +768,7 @@ 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
@@ -807,7 +796,11 @@ servers:
   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
@@ -816,6 +809,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
@@ -858,40 +855,21 @@ servers:
     address: 140.211.166.198
     parents: pieta
     hostgroups: computers, jessie, hassrvfs, porterbox
-  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, xinetd-hosts, jessie
-    #, bosserver
-  rietz2:
-    address: 140.211.166.44
-    parents: rietz
-    hostgroups: secondary-IPs
-  # }}}
-  # {{{ 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, 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
@@ -909,6 +887,14 @@ servers:
     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:
@@ -936,27 +922,27 @@ servers:
   ubc-bl7:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, jessie, 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, jessie, 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, jessie, 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, jessie, 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, jessie, 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, jessie, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
@@ -987,14 +973,6 @@ servers:
     parents: ganeti2
     hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
-  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, service, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -1018,11 +996,11 @@ servers:
   glinka:
     address: 206.12.19.126
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, xinetd-hosts
+    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, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, jessie, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs
   elgar:
     address: 206.12.19.130
     parents: ganeti2
@@ -1060,7 +1038,23 @@ servers:
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
   # }}}
-  # {{{ gw-ugent
+  # {{{ ubc-gateway
+  ubc-enc2bl1:
+    address: 209.87.16.1
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid
+  ubc-enc2bl2:
+    address: 209.87.16.2
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid
+  ubc-enc2bl9:
+    address: 209.87.16.9
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid
+  ubc-enc2bl10:
+    address: 209.87.16.10
+    parents: ubc-gateway
+    hostgroups: computers, bl460, service, jessie, drbd-hosts, multipath-hosts, hpnewraid
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1070,7 +1064,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
+    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
@@ -1106,7 +1100,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, 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
@@ -1216,9 +1210,6 @@ hostgroups:
   dl380:
     alias: HP DL380 hosts
     private: 1
-  dl385:
-    alias: HP DL385 hosts
-    private: 1
   dl360:
     alias: HP DL360 hosts
     private: 1
@@ -1228,9 +1219,6 @@ hostgroups:
   bm-bl:
     alias: HP blades at bytemark
     private: 1
-  dl585:
-    alias: HP DL385 hosts
-    private: 1
   dl180:
     alias: HP DL180
     private: 1
@@ -1260,6 +1248,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
@@ -1350,9 +1340,6 @@ hostgroups:
   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
@@ -1372,9 +1359,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
@@ -1408,6 +1395,8 @@ servicegroups:
   security:
     alias: security
     servicegroup_members: apt, kernel, samhain
+  mirror:
+    alias: mirror stuff
   MQ:
     alias: rabbitMQ stuff
 # }}}
@@ -1443,17 +1432,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -X nfs4 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount|/proc/sys/fs/binfmt_misc'"
     hostgroups: computers
-    excludehosts: sibelius, rietz
+    excludehosts: sibelius
   -
     name: disk usage - all
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x nfs4 -x /srv/farm-snapshot/farm-misc 95 98"
     hosts: sibelius
-  -
-    name: disk usage - all
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x nfs4 -x /srv -x /home 95 98"
-    hosts: rietz
 
   -
     name: disk usage on /
@@ -1475,16 +1459,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
     hostgroups: hassrvfs
-  -
-    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
@@ -1534,7 +1513,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
@@ -1650,7 +1629,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: backuphost, storace, backuphost
+    excludehosts: backuphost, storace
     check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1680,6 +1659,11 @@ services:
     excludehostgroups: buildd, porterbox, no-bacula
     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
@@ -1970,6 +1954,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
   -
@@ -2021,6 +2010,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
   -
@@ -2052,8 +2051,8 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz
+    hostgroups: dl380, dl360, bl460, dl180
+    excludehosts: schein
     excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
@@ -2066,19 +2065,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     check_interval: 120
-    hosts: schein, rietz
+    hosts: schein
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
     check_interval: 120
     hosts: franck
-  -
-    name: HW - hpacucli status
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
-    check_interval: 120
-    hostgroups: dl585
   -
     name: HW - hpssacli status
     servicegroups: raid
@@ -2096,7 +2089,7 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
+    hostgroups: dl380, dl360, bl460, bm-bl
     excludehosts: villa, lobos, schein, storace, mirror-anu
   -
     name: HW - hpasmcli status
@@ -2414,7 +2407,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
@@ -2583,10 +2576,12 @@ 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"
@@ -2594,6 +2589,7 @@ services:
     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"
@@ -2601,6 +2597,184 @@ services:
     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
   -
@@ -2694,6 +2868,16 @@ services:
     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
   -
@@ -2716,10 +2900,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'"
@@ -2752,11 +2936,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'"
@@ -2779,12 +2958,6 @@ 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
   -
     name: network service - rsync
     check: check_tcp!873