Remove murphy (RT#4360)
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index c8c25aa..ad8a1de 100644 (file)
@@ -19,15 +19,6 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
-  gw-1und1:
-    address: 195.20.247.54
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: joerg
-#  gw-1und1-sec:
-#    address: 212.227.126.33
-#    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
     parents: gw-ubcece
@@ -45,11 +36,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-arm:
-    address: 82.44.141.46
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-brainfood:
-    address: 70.103.162.1
+    address: 213.104.121.213
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-brown:
@@ -85,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
@@ -167,12 +149,16 @@ servers:
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
-    parents: gw-1und1
+    parents: gw-ubcece
     hostgroups: computers, service, acpid-hosts, wheezy
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
     hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+  babin:
+    address: 213.165.95.6
+    parents: powell
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -206,7 +192,7 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-arm
   abel:
@@ -216,7 +202,7 @@ servers:
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
@@ -224,15 +210,15 @@ servers:
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   arne:
     address: 217.140.96.61
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, deadslow
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -250,12 +236,6 @@ servers:
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
-  # {{{ gw-brainfood
-  murphy:
-    address: 97.107.116.31
-    parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
-  # }}}
   # {{{ gw-brown
   franck:
     address: 138.16.160.12
@@ -270,40 +250,44 @@ servers:
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
   bm-bl8:
     address: 5.153.231.248
     parents: gw-bytemark
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
 
   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
@@ -326,6 +310,10 @@ servers:
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
     contacts: holger
+  binet:
+    address: 5.153.231.8
+    parents: gw-bytemark
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -338,11 +326,11 @@ servers:
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, wheezy
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, wheezy
   # }}}
   # {{{ gw-cecsit
   gluck:
@@ -394,12 +382,6 @@ servers:
     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
-  # }}}
   # {{{ gw-grnet
   barber:
     address: 194.177.211.203
@@ -408,28 +390,15 @@ servers:
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy, bacula-client
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, mptraid, hassrvfs, service, squeeze
-  fasch:
-    address: 194.177.211.201
-    parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
-    contacts: christoph
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
     hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts, service, apache-https, squeeze
-  holter:
-    address: 194.177.211.202
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid, service, squeeze
-  krenek:
-    address: 194.177.211.207
-    parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
   orff:
     address: 194.177.211.209
     parents: gw-grnet
@@ -437,19 +406,12 @@ servers:
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
+    hostgroups: computers, acpid-hosts, megaraid, service, squeeze, nfs-server
   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
-  # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
@@ -472,7 +434,7 @@ servers:
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
+    hostgroups: computers, buildd, sw-raid, hassrvfs, wheezy
     contacts: bzed
   ball:
     address: 82.195.75.70
@@ -482,7 +444,7 @@ servers:
   czerny:
     address: 82.195.75.109
     parents: gw-man-da
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
   clementi:
     address: 82.195.75.103
     parents: gw-man-da
@@ -500,6 +462,11 @@ servers:
     parents: ganeti3
     hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
+  fayrfax:
+    address: 82.195.75.82
+    parents: ganeti3
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    contacts: christoph
   vento:
     address: 82.195.75.98
     parents: ganeti3
@@ -519,19 +486,19 @@ servers:
   diamond:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, bind9-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
   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, squeeze, bacula-client
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy, bacula-client
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
+    hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, apache2-hosts, squeeze, apache-https, hasvarfs
+    hostgroups: computers, service, kvmdomains, apache2-hosts, wheezy, apache-https
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
@@ -563,7 +530,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, wheezy, hasvarlogfs, apache2-hosts
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
@@ -589,14 +556,10 @@ servers:
     address: 140.211.15.152
     parents: gw-osuosl
     hostgroups: computers, wheezy, hassrvfs
-  piston:
-    address: 140.211.15.154
-    parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs
   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
@@ -644,11 +607,11 @@ servers:
   eysler:
     address: 86.59.118.152
     parents: gw-sil
-    hostgroups: computers, buildd, squeeze
+    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
+    hostgroups: computers, dl360, acpid-hosts, nfs-client, rsyncd-hosts, xinetd-hosts, service, squeeze, autofs
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -658,7 +621,7 @@ servers:
   vasks:
     address: 217.196.43.140
     parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
+    hostgroups: computers, nfs-server, postgres91-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
     no-servicegroups: true
   wagner:
@@ -695,7 +658,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: sw-ubcece-mcld
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -744,7 +707,7 @@ servers:
   brahms:
     address: 206.12.19.115
     parents: ganeti2
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, wheezy
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, wheezy
   geo2:
     address: 206.12.19.113
     parents: ganeti2
@@ -814,7 +777,7 @@ servers:
   traetta:
     address: 206.12.19.21
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -826,11 +789,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, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, heavy-exim, postgres84-hosts, xinetd-hosts, apache2-hosts, apache-https
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, heavy-exim, xinetd-hosts, apache2-hosts, apache-https
   reger:
     address: 206.12.19.124
     parents: ganeti2
@@ -842,7 +805,7 @@ servers:
   glinka:
     address: 206.12.19.126
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, xinetd-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, xinetd-hosts
   dukas:
     address: 206.12.19.128
     parents: traetta
@@ -878,7 +841,7 @@ servers:
   diabelli:
     address: 206.12.19.136
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, apache-https, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, apache2-hosts, apache-https, bacula-client
   bizet:
     address: 206.12.19.137
     parents: ganeti2
@@ -902,12 +865,11 @@ 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, squeeze, hassrvfs, apache2-hosts
-    #, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
   coincy:
     address: 206.12.19.144
     parents: ganeti2
@@ -948,15 +910,15 @@ servers:
   hildegard:
     address: 144.32.168.74
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   howells:
     address: 144.32.168.75
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   hummel:
     address: 144.32.168.76
     parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
@@ -1045,6 +1007,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  bm-bl:
+    alias: HP blades at bytemark
+    private: 1
   dl585:
     alias: HP DL385 hosts
     private: 1
@@ -1242,7 +1207,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
@@ -1271,7 +1236,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-trees"
     hostgroups: computers
     excludehosts: sibelius,stabile
   -
@@ -1288,7 +1253,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
   -
@@ -1311,27 +1276,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
@@ -1371,7 +1325,7 @@ services:
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/mirrors"
     hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -2020,11 +1974,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
     hostgroups: computers
     excludehostgroups: deadslow
-  -
-    name: unwanted process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
-    hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server, deadslow
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
@@ -2096,13 +2045,19 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: schein
+    excludehosts: schein, rietz
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
+    normal_check_interval: 120
+    hostgroups: bm-bl
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     normal_check_interval: 120
-    hosts: schein
+    hosts: schein, rietz
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2120,7 +2075,7 @@ services:
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585
+    hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
     excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
@@ -2134,9 +2089,9 @@ services:
     hosts: senfl, schein
  ###
   -
-    name: RAID - areca
+    name: RAID - 3ware
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
     hosts: powell
  ###
   -
@@ -2262,6 +2217,11 @@ services:
     check: check_tcp!873
     hosts: merikanto2
     depends: merikanto:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: milanollo2
+    depends: milanollo:process - xinetd
 
  ###
   -
@@ -2310,13 +2270,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
   -
@@ -2480,14 +2440,14 @@ services:
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
-    hosts: fano, fasch, finzi, fils
+    hosts: fano, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    excludehosts: fano, fasch, finzi, fils
+    excludehosts: fano, finzi, fils, fayrfax
     contact_groups: buildd
   -
     name: processes - zombie schroot
@@ -2495,6 +2455,11 @@ 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
+  -
+    name: processes - lvcreate
+    nrpe: "/usr/lib/nagios/plugins/check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
+    hostgroups: buildd
+    contact_groups: +buildd
  ####
   -
     name: network service - gobby
@@ -2511,11 +2476,6 @@ services:
 
  ############ NFS Stuff ############
  ####
-  -
-    name: process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C portmap -a '/sbin/portmap'"
-    hostgroups: nfs-client, nfs-server
-    excludehostgroups: wheezy
   -
     name: process - statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"