X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=fdcb19c3111152488db6335caba70926ec1cdfb8;hb=33010000c54cdee9cff1fbd8a1876238c9173498;hp=d028c5bb6266ad0ff4c25e52d28121504947b569;hpb=ed45617d18b6641683a3fd99437dfcba9e28b89c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d028c5b..625c471 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -19,6 +19,16 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
+  gw-1und1:
+    parents: gw-ubcece
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
+  gw-1und1-sec:
+    parents: gw-ubcece
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
   gw-accumu:
     address: 130.239.18.97
     parents: gw-ubcece
@@ -77,7 +87,11 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-karlsruhe:
-    address: 129.143.166.229
+    address: 129.143.57.177
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
+  gw-leaseweb:
+    address: 185.17.185.190
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-man-da:
@@ -85,7 +99,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-marist:
-    address: 148.100.96.1
+    address: 148.100.88.1
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-osuosl:
@@ -113,12 +127,6 @@ servers:
     address: 86.59.118.145
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-telegraaf2:
-    address: 217.196.40.15
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contact_groups: +alioth-admins
-    no-servicegroups: true
   gw-ubcece:
     address: 206.12.19.254
     hostgroups: layer3-infrastructure
@@ -137,7 +145,8 @@ servers:
     hostgroups: layer3-infrastructure
   gw-ynic:
     # really janet, because ynic is stupid about firewalling
-    address: 146.97.42.26
+    #address: 146.97.42.26
+    address: 146.97.41.66
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-zivit:
@@ -149,12 +158,12 @@ servers:
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
-    parents: gw-ubcece
+    parents: gw-1und1
     hostgroups: computers, service, acpid-hosts, wheezy
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula, apache-https
   babin:
     address: 213.165.95.6
     parents: powell
@@ -163,8 +172,7 @@ servers:
   # {{{ gw-1und1-sec
   schumann:
     address: 212.227.126.54
-    parents: gw-ubcece
-    #parents: gw-1und1-sec
+    parents: gw-1und1-sec
     hostgroups: computers, acpid-hosts, service, wheezy
   chopin:
     address: 195.20.242.124
@@ -180,8 +188,7 @@ servers:
     hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
   wieck:
     address: 195.20.242.89
-    parents: gw-ubcece
-    #parents: gw-1und1-sec
+    parents: gw-1und1-sec
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
@@ -199,10 +206,6 @@ servers:
     address: 217.140.96.56
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, deadslow
-  alain:
-    address: 217.140.96.58
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
@@ -241,10 +244,6 @@ servers:
     address: 138.16.160.12
     parents: gw-brown
     hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
-  ries:
-    address: 138.16.160.9
-    parents: gw-brown
-    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, wheezy, postgres91-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -279,6 +278,14 @@ servers:
     address: 5.153.231.248
     parents: gw-bytemark
     hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl9:
+    address: 5.153.231.249
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-conpute
+  bm-bl10:
+    address: 5.153.231.250
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
 
   milanollo:
     address: 5.153.231.2
@@ -291,11 +298,11 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim, spamd
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula, apache-https
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
@@ -303,7 +310,7 @@ servers:
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, apache-https
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
@@ -318,28 +325,86 @@ servers:
     address: 5.153.231.10
     parents: gw-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, postgres91-hosts
+  ganeti-bytemark:
+    address: 82.195.75.111
+    parents: gw-bytemark
+    hostgroups: notacomputer
   coccia:
     address: 5.153.231.11
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
   backuphost:
     address: 5.153.231.12
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy
   philp:
     address: 5.153.231.13
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
   couper:
     address: 5.153.231.14
-    parents: gw-bytemark
+    parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+  rainier:
+    address: 5.153.231.16
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, no-bacula
+  rapoport:
+    address: 5.153.231.15
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, no-bacula
+  delfin:
+    address: 5.153.231.17
+    parents: ganeti-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
+  wuiet:
+    address: 5.153.231.18
+    parents: ganeti-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+  dinis:
+    address: 5.153.231.19
+    parents: ganeti-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy
+  donizetti:
+    address: 5.153.231.20
+    parents: ganeti-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
+  moszumanska:
+    address: 5.153.231.21
+    parents: ganeti-bytemark
+    contact_groups: alioth-admins
+    hostgroups: computers, general, wheezy, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain, no-bacula, bind9-hosts, xinetd-hosts, alioth, heavy-exim, spamd
+    no-servicegroups: true
+  dillon:
+    address: 5.153.231.22
+    parents: ganeti-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, hassrvfs
+  ticharich:
+    address: 5.153.231.23
+    parents: ganeti-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service
+  diamond:
+    address: 5.153.231.24
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
+  petrova:
+    address: 5.153.231.25
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
+  oyens:
+    address: 5.153.231.26
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, apache2-hosts, openstack-controller
+  barriere:
+    address: 5.153.231.27
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   # }}}
   # {{{ gw-c3sl
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror, no-bacula, apache-https
     contacts: faw
   # }}}
   # {{{ gw-carnet
@@ -356,7 +421,7 @@ servers:
   gluck:
     address: 150.203.164.38
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror, no-bacula, apache-https
   # }}}
   # {{{ gw-conova
   sompek:
@@ -372,7 +437,7 @@ servers:
   senfl:
     address: 128.31.0.51
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts, squeeze
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts, squeeze, apache-https
   steffani:
     address: 128.31.0.36
     parents: gw-csail
@@ -385,18 +450,18 @@ servers:
     hostgroups: computers, sw-raid, hassrvfs, wheezy
   # }}}
   # {{{ gw-ftcollins
-  alkman:
-    address: 192.25.206.63
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, acpid-hosts, wheezy
-  merulo:
-    address: 192.25.206.58
-    parents: gw-ftcollins
-    hostgroups: computers, porterbox, hasusrfs, wheezy
-  mundy:
-    address: 192.25.206.62
-    parents: gw-ftcollins
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
+  #alkman:
+  #  address: 192.25.206.63
+  #  parents: gw-ftcollins
+  #  hostgroups: computers, buildd, acpid-hosts, wheezy
+  #merulo:
+  #  address: 192.25.206.58
+  #  parents: gw-ftcollins
+  #  hostgroups: computers, porterbox, hasusrfs, wheezy
+  #mundy:
+  #  address: 192.25.206.62
+  #  parents: gw-ftcollins
+  #  hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, wheezy
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
@@ -415,10 +480,6 @@ servers:
     address: 194.177.211.205
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
-  grieg:
-    address: 194.177.211.200
-    parents: gw-grnet
-    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
@@ -438,6 +499,32 @@ servers:
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
+  # {{{ gw-leaseweb
+  lw01:
+    address: 185.17.185.177
+    parents: gw-leaseweb
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
+  lw02:
+    address: 185.17.185.178
+    parents: gw-leaseweb
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
+  lw03:
+    address: 185.17.185.179
+    parents: gw-leaseweb
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
+  lw04:
+    address: 185.17.185.180
+    parents: gw-leaseweb
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl180
+  lw05:
+    address: 185.17.185.181
+    parents: gw-leaseweb
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid
+  lw06:
+    address: 185.17.185.182
+    parents: gw-leaseweb
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid
+  # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
     address: 129.143.160.6
@@ -446,16 +533,6 @@ servers:
     contacts: pkern
   # }}}
   # {{{ gw-man-da
-  agricola:
-    address: 82.195.75.86
-    parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, wheezy
-    contacts: bzed
-  arcadelt:
-    address: 82.195.75.87
-    parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
-    contacts: bzed
   ball:
     address: 82.195.75.70
     parents: gw-man-da
@@ -472,7 +549,7 @@ servers:
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, wheezy, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
     parents: ganeti3
@@ -490,7 +567,7 @@ servers:
   vento:
     address: 82.195.75.98
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, heavy-exim
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https, heavy-exim
   lully:
     address: 82.195.75.99
     parents: ganeti3
@@ -503,14 +580,10 @@ servers:
     address: 82.195.75.102
     parents: gw-man-da
     hostgroups: computers, service, dl360, acpid-hosts, wheezy
-  diamond:
-    address: 82.195.75.108
-    parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-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, wheezy
   geo1:
     address: 82.195.75.105
     parents: ganeti3
@@ -523,6 +596,10 @@ servers:
     address: 82.195.75.107
     parents: ganeti3
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts, wheezy
+  stockhausen:
+    address: 82.195.75.108
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, acpid-hosts, jetty-hosts
   ganeti3:
     address: 82.195.75.111
     parents: gw-man-da
@@ -530,7 +607,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache-https, rsyncd-hosts, xinetd-hosts
   vieuxtemps:
     address: 82.195.75.113
     parents: ganeti3
@@ -539,18 +616,26 @@ servers:
     address: 82.195.75.114
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy, spamd, heavy-exim, mail-relay
+  denis:
+    address: 82.195.75.91
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
+  vogler:
+    address: 82.195.75.92
+    parents: ganeti3
+    hostgroups: computers, service, kvmdomains, wheezy
   # }}}
   # {{{ gw-marist
-  zappa:
-    address: 148.100.96.103
+  zani:
+    address: 148.100.88.22
     parents: gw-marist
-    hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
+    hostgroups: computers, buildd, hassrvfs, wheezy, incomingmailrelayed, ping-suckers
   # }}}
   # {{{ gw-osuosl
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula, apache-https
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -558,7 +643,7 @@ servers:
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs, apache-https
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -579,7 +664,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -591,7 +676,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-rapidswitch
-    hostgroups: computers, buildd, sw-raid, squeeze
+    hostgroups: computers, buildd, sw-raid, wheezy, hassrvfs, acpid-hosts
   # }}}
   # {{{ gw-sanger
   sibelius:
@@ -628,26 +713,10 @@ servers:
     address: 86.59.118.152
     parents: gw-sil
     hostgroups: computers, buildd, wheezy
-  # }}}
-  # {{{ gw-telegraaf2
-  vasks:
-    address: 217.196.43.140
-    parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
-    contact_groups: alioth-admins
-    no-servicegroups: true
-  wagner:
-    address: 217.196.43.132
-    parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres91-hosts, apache-https, dl385, brokensamhain
-    contact_groups: alioth-admins
-    no-servicegroups: true
-  anonscm:
-    address: 217.196.43.132
-    parents: wagner
-    contact_groups: alioth-admins
-    hostgroups: secondary-IPs
-    no-servicegroups: true
+  eberlin:
+    address: 86.59.118.155
+    parents: gw-sil
+    hostgroups: computers, buildd, wheezy
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -708,10 +777,6 @@ servers:
     address: 206.12.19.118
     parents: ganeti2
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
-  dinis:
-    address: 206.12.19.139 
-    parents: ganeti2
-    hostgroups: computers, general, kvmdomains, wheezy
   wolkenstein:
     address: 206.12.19.116
     parents: ganeti2
@@ -728,10 +793,6 @@ servers:
     address: 206.12.19.13
     parents: sw-ubcece-kais
     hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
-  paganini:
-    address: 206.12.19.10
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client, service, apache2-hosts, squeeze, autofs
   respighi:
     address: 206.12.19.11
     parents: sw-ubcece-kais
@@ -797,11 +858,11 @@ servers:
   quantz:
     address: 206.12.19.122
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
     parents: traetta
-    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https, broken_https_default_vhost
   reger:
     address: 206.12.19.124
     parents: ganeti2
@@ -814,10 +875,6 @@ servers:
     address: 206.12.19.126
     parents: traetta
     hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, xinetd-hosts
-  dukas:
-    address: 206.12.19.128
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, heavy-exim, apache2-hosts, nfs-client, autofs, hassrvfs, apache-https
   tye:
     address: 206.12.19.129
     parents: ganeti2
@@ -826,10 +883,6 @@ servers:
     address: 206.12.19.130
     parents: salieri
     hostgroups: computers, service, kvmdomains, wheezy
-  berlioz:
-    address: 206.12.19.131
-    parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
   gombert:
     address: 206.12.19.132
     parents: ganeti2
@@ -842,14 +895,10 @@ servers:
     address: 206.12.19.134
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
-  barriere:
-    address: 206.12.19.135
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, broken_https_default_vhost
   bizet:
     address: 206.12.19.137
     parents: ganeti2
@@ -865,11 +914,11 @@ servers:
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula
+    hostgroups: computers, service, kvmdomains, wheezy, 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, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs, apache-https
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
@@ -878,14 +927,6 @@ servers:
     address: 206.12.19.143
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
-  coincy:
-    address: 206.12.19.144
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
-  stanley:
-    address: 206.12.19.145
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, no-bacula
   muffat:
     address: 206.12.19.146
     parents: ganeti2
@@ -913,12 +954,16 @@ servers:
     address: 130.89.148.12
     parents: klecker
     hostgroups: secondary-IPs
+  klecker-archive:
+    address: 130.89.148.13
+    parents: klecker
+    hostgroups: secondary-IPs
+  klecker-static:
+    address: 130.89.148.14
+    parents: klecker
+    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-ynic
-  hildegard:
-    address: 144.32.168.74
-    parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   howells:
     address: 144.32.168.75
     parents: gw-ynic
@@ -940,11 +985,11 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
   zelenka:
     address: 80.245.147.40
     parents: gw-zivit
-    hostgroups: computers, porterbox, hassrvfs, squeeze
+    hostgroups: computers, porterbox, hassrvfs, wheezy
   # }}}
   # }}}
 
@@ -1021,6 +1066,12 @@ hostgroups:
   dl585:
     alias: HP DL385 hosts
     private: 1
+  dl180:
+    alias: HP DL180
+    private: 1
+  dl120:
+    alias: HP DL120
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -1066,6 +1117,9 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
+  jetty-hosts:
+    alias: hosts running jetty
+    private: 1
   varnish-hosts:
     alias: hosts running varnish
     private: 1
@@ -1091,9 +1145,6 @@ hostgroups:
   #postgres81-hosts:
   #  alias: hosts running postgres81
   #  private: 1
-  postgres84-hosts:
-    alias: hosts running postgres84
-    private: 1
   postgres91-hosts:
     alias: hosts running postgres91
     private: 1
@@ -1112,6 +1163,9 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
+  broken_https_default_vhost:
+    alias: https default vhost does not say 200 OK
+    private: 1
 
   no-bacula:
     alias: hosts which are not being backed up with bacula
@@ -1169,15 +1223,23 @@ hostgroups:
     # i.e. no port 25
     private: 1
 
-  ntpsuckers:
-    alias: "hosts who's ntp offset is often unknown"
-    private: 1
-
   brokensamhain:
     alias: machines that can not run samhain
     private: 1
   high-RTT:
-    alias: machines with hight round trip times
+    alias: machines with high round trip times
+    private: 1
+  ping-suckers:
+    alias: machines that just suck at icmp
+    private: 1
+  alioth:
+    alias: machines that just are just awkward
+    private: 1
+  openstack-compute:
+    alias: nodes that run OpenStack compute
+    private: 1
+  openstack-controller:
+    alias: nodes that run OpenStack controller
     private: 1
 
   security_mirror:
@@ -1197,8 +1259,6 @@ servicegroups:
     alias: backup checks
   kernel:
     alias: kernel checks
-  weaksshkeys:
-    alias: weak ssh keys
   apt:
     alias: apt upgrade status
   samhain:
@@ -1207,7 +1267,7 @@ servicegroups:
     alias: time stuff
   security:
     alias: security
-    servicegroup_members: apt, weaksshkeys, kernel, samhain
+    servicegroup_members: apt, kernel, samhain
 
 #############################
 # services
@@ -1217,7 +1277,7 @@ services:
     name: PING
     check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: layer3-infrastructure, high-RTT
+    excludehostgroups: layer3-infrastructure, high-RTT, ping-suckers
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1228,6 +1288,13 @@ services:
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
+  -
+    name: PING
+    check: "check_ping!600.0,90%!900.0,95%"
+    hostgroups: ping-suckers
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
@@ -1241,10 +1308,11 @@ services:
 
  ############ Disk Usage ############
  ####
+
   -
     name: disk usage - all
     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 --ignore-eregi-path=/home/buildd/build-trees"
+    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 --ignore-eregi-path='/home/buildd/build-tr|/var/lib/schroot/mount'"
     hostgroups: computers
     excludehosts: sibelius,stabile
   -
@@ -1304,11 +1372,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
     hostgroups: hashomefs
-  -
-    name: disk usage on /x
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
-    hosts: caballero
   -
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
@@ -1342,12 +1405,12 @@ services:
   -
     name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 95 90 /srv/farm-snapshot/farm-misc"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-misc"
     hosts: sibelius
   -
-    name: disk usage on /var/lib/postgresql/9.1/dak
+    name: disk usage on /var/lib/postgresql/9.1
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1/dak"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.1"
     hosts: franck
   -
     name: disk usage on /srv/ftp-master.debian.org
@@ -1419,7 +1482,7 @@ services:
   -
     name: backup - bacula - last full backup
     servicegroups: backup
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -w 840 -c 1560 $HOSTNAME$.debian.org F"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula -w 1080 -c 1560 $HOSTNAME$.debian.org F"
     runfrom: dinis
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
@@ -1430,8 +1493,7 @@ services:
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
-    excludehostgroups: freebsd
-    excludehosts: wagner, vasks
+    excludehostgroups: freebsd, alioth
   -
     name: process - bacula-fd
     servicegroups: backup
@@ -1481,7 +1543,6 @@ services:
   #  name: puppet
   #  nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
   #  hostgroups: computers
-  #  excludehosts: wagner, vasks
 
  ####
   -
@@ -1489,14 +1550,15 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
     hostgroups: computers
     excludehostgroups: freebsd
-    excludehosts: vasks, wagner
   -
     name: puppetized firewall
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
     hostgroups: computers
     excludehostgroups: freebsd
-    excludehosts: vasks, wagner
-
+ ####
+  - name: ganeti - job watcher paused
+    nrpe: "/usr/lib/nagios/plugins/negate /usr/lib/nagios/plugins/dsa-check-file -f /var/lib/ganeti/watcher.pause"
+    hostgroups: computers
  ####
   -
     name: process - samhain
@@ -1512,7 +1574,11 @@ services:
     normal_check_interval: 60
     retry_check_interval: 5
     excludehostgroups: brokensamhain
-
+ ####
+  -
+    name: process - acc.umu.se backup
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -a 'dsmc'"
+    hosts: sibelius
  ####
   -
     name: users
@@ -1534,6 +1600,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-uptime"
     hostgroups: computers
  ####
+  -
+    name: processes - samhain zombies
+    nrpe: "/usr/lib/nagios/plugins/check_procs 3 6 -s Z -u root -a samhain"
+    event_handler: dsa_event_handler_restart_samhain
+    hostgroups: computers
+    excludehostgroups: brokensamhain
   -
     name: processes - zombies
     nrpe: "/usr/lib/nagios/plugins/check_procs 5 10 -s Z"
@@ -1571,14 +1643,6 @@ services:
     depends: process - sshd
     normal_check_interval:  60
     notification_interval: 1440
-
-  -
-    name: ssh - weak keys
-    servicegroups: weaksshkeys
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
-    hostgroups: computers
-    excludehosts: wagner, vasks
-    normal_check_interval:  60
  ####
   -
     name: network service - nrpe
@@ -1598,7 +1662,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
     excludehostgroups: freebsd, armhf
-    excludehosts: vasks, wagner
   -
     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'"
@@ -1613,7 +1676,6 @@ services:
     check: check_tcp!4949
     hostgroups: computers
     depends: process - munin-node
-    excludehosts: vasks, wagner
  ###
   -
     name: process - ntpd
@@ -1626,7 +1688,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: ancina
-    excludehostgroups: ntpsuckers, deadslow
+    excludehostgroups: deadslow
     servicegroups: time
   #
   -
@@ -1653,7 +1715,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
     excludehostgroups: freebsd
-    excludehosts: vasks, wagner
 
   -
     name: process - syslog-ng
@@ -1665,13 +1726,29 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: lotti
     hostgroups: computers
-    excludehosts: vasks, wagner
+    excludehostgroups: alioth
   -
     name: remote logging on lully
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: lully
     hostgroups: computers
-    excludehosts: vasks, wagner
+    excludehostgroups: alioth
+  -
+    name: MQ connection on rainier
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
+    runfrom: rainier
+    hostgroups: computers
+    normal_check_interval:  60
+    retry_check_interval: 15
+    excludehostgroups: alioth
+  -
+    name: MQ connection on rapoport
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
+    runfrom: rapoport
+    hostgroups: computers
+    normal_check_interval:  60
+    retry_check_interval: 15
+    excludehostgroups: alioth
  ### MAIL STUFF
  ###
   -
@@ -1703,40 +1780,36 @@ services:
     name: process - clamav - clamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u clamav -C clamd -a '/usr/sbin/clamd'"
     hostgroups: heavy-exim, heavy-postfix
-    hosts: wagner
   -
     name: service - clamav
     nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl"
     hostgroups: heavy-exim, heavy-postfix
-    hosts: wagner
     depends: process - clamav - clamd
   -
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
-    hosts: wagner
     hostgroups: heavy-exim, heavy-postfix
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix, deadslow
-    excludehosts: wagner
   -
     name: unwanted process - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix, deadslow
-    excludehosts: wagner
+ ###
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
-    excludehosts: wagner, picconi
+    excludehosts: picconi
     excludehostgroups: deadslow
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: wagner, picconi
+    hosts: picconi
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1744,7 +1817,7 @@ services:
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
-    hosts: wagner, bendel
+    hosts: bendel
     hostgroups: spamd
     depends: process - spamd - master
   #
@@ -1762,7 +1835,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd, deadslow
-    excludehosts: bendel, busoni, wagner, buxtehude
+    excludehosts: bendel, busoni, buxtehude
 
  ###
   #-
@@ -1777,19 +1850,13 @@ services:
     excludehostgroups: deadslow
 
  ###
-  -
-    name: process - postgrey
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
-    hostgroups: heavy-exim
-    excludehostgroups: wheezy
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
     hostgroups: heavy-exim
-    excludehostgroups: squeeze
   -
     name: process - postgrey
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
     hostgroups: heavy-postfix
   #
   -
@@ -1800,11 +1867,11 @@ services:
  ###
   -
     name: process - amavis - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd-new (master)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -a 'amavisd-new (master)'"
     hostgroups: amavis-hosts
   -
     name: process - amavis - all
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd-new '"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -a 'amavisd-new '"
     hostgroups: amavis-hosts
     depends: process - amavis - master
   #
@@ -1817,24 +1884,23 @@ services:
   -
     name: process - weightd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (master)'"
-    hostgroups: heavy-postfix
+    hostgroups: heavy-postfix, alioth
   -
     name: process - weightd - cache
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -a 'policyd-weight (cache)'"
-    hostgroups: heavy-postfix
+    hostgroups: heavy-postfix, alioth
     depends: process - weightd - master
   -
     name: process - weightd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -a 'policyd-weight (child)'"
-    hostgroups: heavy-postfix
+    hostgroups: heavy-postfix, alioth
     depends: process - weightd - master
-  #
+ ###
   -
     name: unwanted process - policyd-weight
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
     hostgroups: computers
-    excludehostgroups: heavy-postfix, deadslow
-
+    excludehostgroups: heavy-postfix, deadslow, alioth
 
 
  ###
@@ -1924,51 +1990,41 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
-    excludehosts: wagner, vasks
     normal_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
-    excludehosts: wagner, vasks
     normal_check_interval: 60
-  -
-    name: setup - ud-ldap freshness
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
-    excludehosts: wagner, vasks
-    hostgroups: computers
   -
     name: system - available entropy
     nrpe: "/usr/lib/nagios/plugins/dsa-check-entropy"
     event_handler: dsa_event_handler_restart_ekey
     hostgroups: computers
-    excludehosts: vasks, wagner
     excludehostgroups: freebsd
   -
     name: system - filesystem check
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
     normal_check_interval:  60
     retry_check_interval: 15
-    excludehosts: wagner, vasks
     hostgroups: computers
  ###
   -
     name: local resolver
     nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
     hostgroups: computers
-    excludehosts: vasks, wagner
     normal_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'"
-    excludehosts: vasks, wagner
     hostgroups: unbound-hosts, squeeze, wheezy
+    excludehostgroups: alioth
  ###
   -
     name: process - uptimed
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
-    excludehosts: vasks, wagner
  ###
   -
     name: unwanted process - irqbalance
@@ -2000,7 +2056,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, abel, alwyn, vasks
+    excludehosts: abel, alwyn
     excludehostgroups: deadslow
   -
     name: unwanted process - snmpd
@@ -2013,10 +2069,6 @@ services:
     name: "host SSL cert"
     nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi"
     hostgroups: computers
-  -
-    name: "pg SSL cert"
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/pg-ubcece.debian.org-chained.pem"
-    hosts: danzi
 
  ############ Processes/Services that only run on some computers ############
  ####
@@ -2046,22 +2098,30 @@ services:
     hostgroups: sw-raid
 
  ###
+  -
+    name: process - ud-replicated
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C ud-replicated -a '/usr/bin/python /usr/bin/ud-replicated'"
+    hostgroups: computers
+    excludehostgroups: squeeze, freebsd, alioth
+  -
+    name: process - ud-replicated
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C python2.7 -a '/usr/bin/python /usr/bin/ud-replicated'"
+    hostgroups: freebsd
   -
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hostgroups: computers
-    excludehosts: vasks, wagner
-    excludehostgroups: armhf
+    hostgroups: squeeze
   -
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hostgroups: wheezy
+    hostgroups: computers
+    excludehostgroups: squeeze, alioth
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl180
     excludehosts: schein, rietz
   -
     name: HW - hpacucli status
@@ -2088,6 +2148,13 @@ services:
     normal_check_interval: 120
     hostgroups: dl585
  ###
+  -
+    name: HW - edac status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
+    normal_check_interval: 120
+    hosts: lw05, lw06
+    #hostgroups: computers
+    #excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
@@ -2164,7 +2231,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
     hostgroups: computers
     excludehostgroups: freebsd, sparc
-    excludehosts: vasks, wagner
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
@@ -2196,11 +2262,6 @@ services:
 #    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
 #    hostgroups: bosserver
 #
- ###
-  -
-    name: process - inetd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg, vasks
  ###
   -
     name: process - xinetd
@@ -2241,6 +2302,16 @@ services:
     # there is always one extra process per check currently running..
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:30 -c 1: -u nagios -C icinga -a '/usr/sbin/icinga -d /etc/icinga/icinga.cfg'"
     hosts: tchaikovsky
+ ###
+  -
+    name: process - jetty - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -a 'jsvc.exec'"
+    hostgroups: jetty-hosts
+  -
+    name: process - jetty - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u jetty -a 'jsvc.exec -user jetty'"
+    hostgroups: jetty-hosts
+    depends: process - jetty - master
 
  ###
   -
@@ -2283,6 +2354,7 @@ services:
     check: check_https
     hostgroups: apache-https
     excludehosts: handel,menotti
+    excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2291,6 +2363,12 @@ services:
     hosts: handel,menotti
     depends: "process - apache2 - master"
     normal_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
   -
     name: network service - https cert
     check: dsa_check_cert!443
@@ -2324,15 +2402,6 @@ services:
 
 ###
 
-# Alioth web URLs
-
-  -
-    name: network service - loggerhead
-    remotecheck: "/usr/lib/nagios/plugins/check_http -H anonscm.debian.org -u /loggerhead/"
-    hosts: anonscm
-    runfrom: tchaikovsky
-    depends: wagner:process - apache2 - master
-
  ####
   -
     name: process - named
@@ -2396,19 +2465,15 @@ services:
     name: unwanted process - postgresql
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres"
     hostgroups: computers
-    excludehostgroups: postgres84-hosts, postgres91-hosts, deadslow
+    excludehostgroups: postgres91-hosts, deadslow
   -
     name: unwanted process - postgresql 9.0
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C postgres -a '9.0/bin/postgres'"
     hostgroups: computers
   -
     name: process - postgresql91 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/9.1/bin/postgres'"
     hostgroups: postgres91-hosts
-  -
-    name: process - postgresql84 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
-    hostgroups: postgres84-hosts
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
@@ -2420,7 +2485,7 @@ services:
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
     hostgroups: squeeze, wheezy
-    excludehostgroups: freebsd
+    excludehostgroups: freebsd, alioth
  ####
   -
     name: process - UPS - nut usbhid-ups - ups1
@@ -2444,10 +2509,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-ups"
     hosts: franck
     depends: process - UPS - nut upsd
-  -
-    name: process - pglistener
-    nrpe: "/usr/lib/nagios/plugins/check_procs -u pglisten -C python -a '/usr/bin/python /usr/share/pglistener/starter.py /etc/pglistener/pglistener.cfg /etc/pglistener/conf.d' -w 1: -c 1:"
-    hosts: wagner, vasks
  ###
   -
     name: process - buildd
@@ -2482,8 +2543,7 @@ services:
     check: check_tcp!6523
     hosts: gombert
     contact_groups: gobby
-
- ###
+ ####
   #-
   #  name: process - tftpd
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
@@ -2509,8 +2569,8 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rpc.mountd -a '/sbin/rpc.mountd'"
     hostgroups: nfs-server
   -
-    name: nfs server stabile reachable
-    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
+    name: nfs server glinka reachable
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.76 -w 50,10% -c 200,30%"
     hosts: quantz
   #
   -
@@ -2525,6 +2585,13 @@ services:
 
  ############ MISC OTHER Stuff ############
  #####
+  -
+    name: puppetmaster cert
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
+    hosts: handel
+    normal_check_interval: 60
+    max_check_attempts: 2
+    retry_check_interval: 5
   -
     name: mirror sync - bugs
     check: "dsa_check_mirrorsync_skew!bugs.debian.org!project/trace/bugs-master.debian.org!120:600"
@@ -2549,42 +2616,48 @@ services:
     retry_check_interval: 5
   -
     name: DNS SOA sync - debian.org
-    check: "dsa_check_soas_add!draghi.debian.org!debian.org"
+    check: "dsa_check_soas_add!denis.debian.org!debian.org"
     hosts: global
   -
     name: DNS SOA sync - debian.net
-    check: "dsa_check_soas_add!draghi.debian.org!debian.net"
+    check: "dsa_check_soas_add!denis.debian.org!debian.net"
     hosts: global
   -
     name: DNS SOA sync - debian.com
-    check: "dsa_check_soas_add!draghi.debian.org!debian.com"
+    check: "dsa_check_soas_add!denis.debian.org!debian.com"
     hosts: global
   -
     name: DNS SOA sync - mirror.debian.net
-    check: "dsa_check_soas_add!draghi.debian.org!mirror.debian.net"
+    check: "dsa_check_soas_add!denis.debian.org!mirror.debian.net"
     hosts: global
   -
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
-    check: "dsa_check_soas_add!draghi.debian.org!144-28.118.59.86.in-addr.arpa"
+    check: "dsa_check_soas_add!denis.debian.org!144-28.118.59.86.in-addr.arpa"
     hosts: global
   -
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
   -
-    name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
+    name: DNS - delegation and signature expiry
+    hosts: global
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d --geozonedir /srv/dns.debian.org/repositories/auto-dns/zones /srv/dns.debian.org/repositories/domains"
+    runfrom: denis
+  -
+    name: DNS - security delegations
     hosts: global
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /srv/dns.debian.org/repositories/domains --dir /srv/dns.debian.org/repositories/auto-dns/zones check-header"
+    runfrom: denis
   -
-    name: DNS SEC - signature expiry
+    name: DNS - key coverage
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d --geozonedir /srv/dns.debian.org/geo/zones /srv/dns.debian.org/var/gitdns/domains"
-    runfrom: orff
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-statusfile /srv/dns.debian.org/var/nagios/coverage"
+    runfrom: denis
   -
-    name: DNS SEC - delegations
+    name: DNS - DS expiry
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /srv/dns.debian.org/var/gitdns/domains --dir /srv/dns.debian.org/geo/zones check-header"
-    runfrom: orff
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-statusfile /srv/dns.debian.org/var/nagios/ds"
+    runfrom: denis
 
  ############
   -
@@ -2602,8 +2675,64 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=7778 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=8867 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini
+ ############
+  -
+    name: current chroots
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-dchroots-current"
+    hostgroups: porterbox
+    normal_check_interval:  60
+    retry_check_interval: 15
+ ############
+  -
+    name: process - openstack - keystone
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C keystone-all -a '/usr/bin/python /usr/bin/keystone-all'"
+    hostgroups: openstack-controller
+  -
+    name: process - openstack - memcached
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nobody -C memcached -a '/usr/bin/memcached -m 64 -p 11211 -u nobody -l 127.0.0.1'"
+    hostgroups: openstack-controller
+  -
+    name: process - openstack - glance-registry
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u glance -C glance-registry -a '/usr/bin/python /usr/bin/glance-registry'"
+    hostgroups: openstack-controller
+  -
+    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-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'"
+    hostgroups: openstack-controller
+  -
+    name: process - openstack - nova-conductor
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-conductor -a '/usr/bin/python /usr/bin/nova-conductor --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-conductor.log'"
+    hostgroups: openstack-controller
+  -
+    name: process - openstack - nova-consoleauth
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-consoleauth -a '/usr/bin/python /usr/bin/nova-consoleauth --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-consoleauth.log'"
+    hostgroups: openstack-controller
+  -
+    name: process - openstack - nova-scheduler
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-scheduler -a '/usr/bin/python /usr/bin/nova-consoleauth --config-file=/etc/nova/nova.conf --log-file /var/log/nova/nova-scheduler.log'"
+    hostgroups: openstack-controller
+  -
+    name: process - openstack - nova-spicehtml5proxy
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u nova -C nova-spicehtml5proxy -a '/usr/bin/python /usr/bin/nova-spicehtml5proxy --log-file /var/log/nova/nova-consoleproxy.log'"
+    hostgroups: openstack-controller
+  -
+    name: process - openstack - neutron-server
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u neutron -C neutron-server -a '/usr/bin/python2.7 /usr/bin/neutron-server --config-file=/etc/neutron/neutron.conf --log-file=/var/log/neutron/neutron-server.log --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini'"
+    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-controller
 
 # vim: set ts=2 sw=2 et ai si fdm=marker: