X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=22d6ca1e89e1a88d957050eb433c602cbdbc2fe8;hb=f6d52fa3c425d0eb5203132df53a23b84d4824c6;hp=97da4aef2b997176d1e4ea244ca0fd29a155c31f;hpb=d4e7cb034e066ce5eb2215a2be10eb49619c2bd2;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 97da4ae..22d6ca1 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -72,11 +72,6 @@ servers:
     address: 194.177.211.193
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-helsinki:
-    address: 128.214.173.25
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: holger
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubcece
@@ -118,12 +113,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
@@ -142,7 +131,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:
@@ -159,7 +149,7 @@ servers:
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula
   babin:
     address: 213.165.95.6
     parents: powell
@@ -170,7 +160,7 @@ servers:
     address: 212.227.126.54
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, acpid-hosts, service, wheezy, bacula-client
+    hostgroups: computers, acpid-hosts, service, wheezy
   chopin:
     address: 195.20.242.124
     parents: schumann
@@ -178,16 +168,16 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy, bacula-client
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, kvmdomains, apache2-hosts, wheezy, apache-https
   wieck:
     address: 195.20.242.89
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs, no-bacula
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -197,7 +187,7 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-arm
   abel:
@@ -219,7 +209,7 @@ servers:
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   arnold:
     address: 217.140.96.57
     parents: gw-arm
@@ -228,10 +218,6 @@ servers:
     address: 217.140.96.66
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
-  hartmann:
-    address: 217.140.96.67
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
   hasse:
     address: 217.140.96.68
     parents: gw-arm
@@ -245,21 +231,11 @@ servers:
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
-  # {{{ gw-brainfood
-  murphy:
-    address: 97.107.116.31
-    parents: gw-ubcece
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
-  # }}}
   # {{{ gw-brown
   franck:
     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:
@@ -298,7 +274,11 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server, xinetd-hosts
+  milanollo2:
+    address: 5.153.231.9
+    parents: milanollo
+    hostgroups: secondary-IPs
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
@@ -306,7 +286,7 @@ servers:
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, no-bacula
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
@@ -314,7 +294,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
@@ -325,12 +305,64 @@ servers:
     address: 5.153.231.8
     parents: gw-bytemark
     hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
+  bmdb1:
+    address: 5.153.231.10
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, postgres91-hosts
+  coccia:
+    address: 5.153.231.11
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
+  backuphost:
+    address: 5.153.231.12
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy
+  philp:
+    address: 5.153.231.13
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
+  couper:
+    address: 5.153.231.14
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+  rainier:
+    address: 5.153.231.15
+    parents: gw-bytemark
+    hostgroups: computers, kvmdomains, wheezy, no-bacula
+  rapoport:
+    address: 5.153.231.16
+    parents: gw-bytemark
+    hostgroups: computers, kvmdomains, wheezy, no-bacula
+  delfin:
+    address: 5.153.231.17
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
+  wuiet:
+    address: 5.153.231.18
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+  dinis:
+    address: 5.153.231.19
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy
+  donizetti:
+    address: 5.153.231.20
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
+  dillon:
+    address: 5.153.231.22
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs
+  ticharich:
+    address: 5.153.231.23
+    parents: gw-bytemark
+    hostgroups: computers, general, kvmdomains, wheezy, nfs-client, autofs, apache2-hosts, apache-https, service
   # }}}
   # {{{ 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
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, wheezy, high-RTT, security_mirror, no-bacula
     contacts: faw
   # }}}
   # {{{ gw-carnet
@@ -347,7 +379,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
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-conova
   sompek:
@@ -367,7 +399,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-dgi
   argento:
@@ -391,13 +423,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-ftcollins
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, apache-https
-  # }}}
-  # {{{ gw-freenet
-  pergolesi:
-    address: 62.104.23.252
-    parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
+    hostgroups: computers, service, dl380, apache2-hosts, wheezy, no-bacula
   # }}}
   # {{{ gw-grnet
   barber:
@@ -412,10 +438,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
@@ -427,20 +449,13 @@ servers:
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, wheezy
-  # }}}
-  # {{{ gw-helsinki
-  piatti:
-    address: 193.167.161.225
-    parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
-    contacts: holger
+    hostgroups: computers, acpid-hosts, mptraid, no-bacula, wheezy
   # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -450,16 +465,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
@@ -476,11 +481,11 @@ 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
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, bacula-client, spamd, heavy-exim, highload
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -498,7 +503,7 @@ servers:
   lully:
     address: 82.195.75.99
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs
   rem:
     address: 82.195.75.68
     parents: gw-man-da
@@ -510,11 +515,11 @@ servers:
   diamond:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
+    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, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
   geo1:
     address: 82.195.75.105
     parents: ganeti3
@@ -534,7 +539,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, rsyncd-hosts, xinetd-hosts
   vieuxtemps:
     address: 82.195.75.113
     parents: ganeti3
@@ -543,6 +548,10 @@ 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
   # }}}
   # {{{ gw-marist
   zappa:
@@ -554,7 +563,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts, no-bacula
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -579,11 +588,11 @@ servers:
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs
+    hostgroups: computers, wheezy, hassrvfs, porterbox
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, apache2-hosts, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -613,17 +622,17 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-sil
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, wheezy, bacula-client
+    hostgroups: computers, hasbootfs, aacraid, service, acpid-hosts, wheezy
   eder:
     address: 86.59.118.151
     parents: gw-sil
@@ -632,34 +641,6 @@ servers:
     address: 86.59.118.152
     parents: gw-sil
     hostgroups: computers, buildd, wheezy
-  merikanto:
-    address: 86.59.118.147
-    parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs, apache2-hosts
-  merikanto2:
-    address: 86.59.118.150
-    parents: merikanto
-    hostgroups: secondary-IPs
-  # }}}
-  # {{{ gw-telegraaf2
-  vasks:
-    address: 217.196.43.140
-    parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-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
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -720,14 +701,10 @@ 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, bacula-client
   wolkenstein:
     address: 206.12.19.116
     parents: ganeti2
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy, bacula-client
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, wheezy
   brahms:
     address: 206.12.19.115
     parents: ganeti2
@@ -736,18 +713,14 @@ servers:
     address: 206.12.19.113
     parents: ganeti2
     hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
-  morricone:
-    address: 206.12.19.9
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
   stabile:
     address: 206.12.19.13
     parents: sw-ubcece-kais
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
+    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
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, service, squeeze, autofs
   respighi:
     address: 206.12.19.11
     parents: sw-ubcece-kais
@@ -813,11 +786,11 @@ servers:
   quantz:
     address: 206.12.19.122
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, 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, hasbootfs, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
   reger:
     address: 206.12.19.124
     parents: ganeti2
@@ -830,10 +803,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
@@ -842,10 +811,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, bacula-client
   gombert:
     address: 206.12.19.132
     parents: ganeti2
@@ -861,15 +826,15 @@ servers:
   barriere:
     address: 206.12.19.135
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+    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, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https
   bizet:
     address: 206.12.19.137
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, no-bacula
   lilburn:
     address: 206.12.19.138
     parents: ganeti2
@@ -881,7 +846,7 @@ servers:
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
@@ -889,20 +854,15 @@ servers:
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
   menotti:
     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
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
   stanley:
     address: 206.12.19.145
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, no-bacula
   muffat:
     address: 206.12.19.146
     parents: ganeti2
@@ -919,7 +879,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-utwente
   klecker:
@@ -957,11 +917,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
   # }}}
   # }}}
 
@@ -1108,9 +1068,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
@@ -1129,9 +1086,9 @@ hostgroups:
   apache-https:
     alias: hosts with https services
     private: 1
-  
-  bacula-client:
-    alias: hosts which are backuped with bacula
+
+  no-bacula:
+    alias: hosts which are not being backed up with bacula
     private: 1
 
   nfs-client:
@@ -1232,7 +1189,7 @@ servicegroups:
 services:
   -
     name: PING
-    check: "check_ping!300.0,20%!600.0,40%"
+    check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
     excludehostgroups: layer3-infrastructure, high-RTT
     normal_check_interval: 5
@@ -1261,7 +1218,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -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
   -
@@ -1278,7 +1235,7 @@ services:
   -
     name: disk usage on /
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
     hostgroups: computers
     excludehosts: spohr
   -
@@ -1301,27 +1258,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-  -
-    name: disk usage on /srv
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hostgroups: hassrvfs
-    excludehosts: stabile, beach
-  -
-    name: disk usage on /srv
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts:  beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
-    hosts: stabile
+    hostgroups: hassrvfs
   -
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, piatti
+    hosts: saens
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1341,7 +1287,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: stabile, sibelius, busoni, buxtehude
+    hosts: sibelius, busoni, buxtehude
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1352,12 +1298,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/spool/postfix"
     hosts: bendel
-
-  #-
-  #  name: disk usage on /srv/morgue.debian.org
-  #  servicegroups: diskspace
-  #  nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
-  #  hosts: stabile
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
@@ -1429,6 +1369,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
+    excludehosts: backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1436,7 +1377,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: beethoven
+    hosts: beethoven, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1445,15 +1386,17 @@ services:
     servicegroups: backup
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-bacula $HOSTNAME$.debian.org"
     runfrom: dinis
-    hostgroups: bacula-client
+    hostgroups: computers
+    excludehostgroups: buildd, porterbox, no-bacula
     normal_check_interval:  60
     retry_check_interval: 15
   -
     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: bacula-client
+    hostgroups: computers
+    excludehostgroups: buildd, porterbox, no-bacula
     normal_check_interval:  60
     retry_check_interval: 15
   -
@@ -1462,7 +1405,6 @@ services:
     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
   -
     name: process - bacula-fd
     servicegroups: backup
@@ -1512,7 +1454,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
 
  ####
   -
@@ -1520,14 +1461,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
@@ -1543,7 +1485,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
@@ -1608,7 +1554,6 @@ services:
     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
  ####
   -
@@ -1629,7 +1574,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'"
@@ -1644,7 +1588,6 @@ services:
     check: check_tcp!4949
     hostgroups: computers
     depends: process - munin-node
-    excludehosts: vasks, wagner
  ###
   -
     name: process - ntpd
@@ -1684,7 +1627,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
@@ -1696,13 +1638,11 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: lotti
     hostgroups: computers
-    excludehosts: vasks, wagner
   -
     name: remote logging on lully
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: lully
     hostgroups: computers
-    excludehosts: vasks, wagner
  ### MAIL STUFF
  ###
   -
@@ -1734,40 +1674,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'"
@@ -1775,7 +1711,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
   #
@@ -1793,7 +1729,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
 
  ###
   #-
@@ -1808,19 +1744,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
   #
   -
@@ -1831,11 +1761,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
   #
@@ -1859,7 +1789,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -a 'policyd-weight (child)'"
     hostgroups: heavy-postfix
     depends: process - weightd - master
-  #
+ ###
   -
     name: unwanted process - policyd-weight
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
@@ -1867,7 +1797,6 @@ services:
     excludehostgroups: heavy-postfix, deadslow
 
 
-
  ###
   -
     name: process - postfix - master
@@ -1914,6 +1843,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:30 -c 0:50 -u postfix -C local -a 'local -t unix'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
+  -
+    name: unwanted process - openvpn
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C openvpn"
+    hostgroups: computers
+    normal_check_interval: 120
+
 
  ###
   -
@@ -1949,45 +1884,43 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
-    excludehosts: wagner, vasks
+    normal_check_interval: 60
+  -
+    name: setup - local hostname etc-hosts
+    nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
+    hostgroups: computers
     normal_check_interval: 60
   -
     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
  ###
   -
     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
@@ -2019,7 +1952,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
@@ -2069,7 +2002,7 @@ services:
     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
+    excludehosts: quantz
     excludehostgroups: armhf
   -
     name: process - monit
@@ -2183,7 +2116,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"
@@ -2215,11 +2147,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
@@ -2242,7 +2169,7 @@ services:
     check: check_tcp!873
     hostgroups: rsyncd-hosts
     depends: process - xinetd
-    excludehosts: merikanto, rietz
+    excludehosts: rietz
   -
     name: network service - rsync
     check: check_tcp!873
@@ -2251,8 +2178,8 @@ services:
   -
     name: network service - rsync
     check: check_tcp!873
-    hosts: merikanto2
-    depends: merikanto:process - xinetd
+    hosts: milanollo2
+    depends: milanollo:process - xinetd
 
  ###
   -
@@ -2301,13 +2228,13 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
-    excludehosts: handel
+    excludehosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
-    hosts: handel
+    hosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -2343,15 +2270,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
@@ -2415,7 +2333,7 @@ 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'"
@@ -2424,14 +2342,11 @@ services:
     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'"
     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"
-    hosts: beethoven
+    #hosts: beethoven
+    hosts: backuphost
  ####
  ####
   -
@@ -2462,10 +2377,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
@@ -2486,6 +2397,9 @@ services:
     nrpe: "(/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0 > /dev/null || /usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0) && /usr/lib/nagios/plugins/check_procs -a schroot -s ZNs -c 0"
     hostgroups: buildd
     contact_groups: +buildd
+    normal_check_interval: 5
+    max_check_attempts: 24
+    retry_check_interval: 5
   -
     name: processes - lvcreate
     nrpe: "/usr/lib/nagios/plugins/check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
@@ -2497,8 +2411,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'"
@@ -2524,8 +2437,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
   #
   -
@@ -2586,10 +2499,6 @@ services:
     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"
-    hosts: global
   -
     name: DNS SEC - signature expiry
     hosts: global