X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=76851cee8b0720462c319b5c6e3994dff3682778;hb=fc46a1a8996bf427d3f58ce2d43a2d033c58b629;hp=eef3446c93ed4aa4a4d56162c318f5e15851245a;hpb=bf62c544c7f302196d043d0119719778feebc58b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index eef3446..76851ce 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,6 +98,10 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-grnet:
+    address: 194.177.211.193
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -178,11 +182,11 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, no-udev, hassrvfs, acpid-hosts
   merkel:
     address: 192.25.206.16
     parents: spohr
@@ -193,7 +197,7 @@ servers:
     hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, spamd, heavy-exim, bind9-hosts
   spohr2:
     address: 192.25.206.38
     parents: spohr
@@ -206,7 +210,7 @@ servers:
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, lenny, single-cpu
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -234,7 +238,7 @@ servers:
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny, hasorgfs
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -263,28 +267,28 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
+    hostgroups: computers, service, lenny, hasbootfs, kvmdomains
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, bind9-hosts
+    hostgroups: computers, service, lenny, hasbootfs, bind9-hosts, kvmdomains
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts, kvmdomains
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts
+    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains
   byrd:
     address: 82.195.75.101
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, spamd, heavy-exim, highload, lenny
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -294,7 +298,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, lenny, uploadqueue
 
   mayer:
     address: 140.211.166.78
@@ -316,6 +320,10 @@ servers:
     address: 140.211.166.44
     parents: rietz
     hostgroups: secondary-IPs
+  busoni:
+    address: 140.211.15.34
+    parents: gw-osuosl
+    hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -324,11 +332,11 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs, hasorgfs
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs, hasorgfs
   gluck:
     address: 150.203.164.38
     parents: gw-anu
@@ -337,11 +345,11 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny
-  mahler:
-    address: 128.31.0.46
-    parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny, hasorgfs
+  #mahler:
+  #  address: 128.31.0.46
+  #  parents: gw-mit-csail
+  #  hostgroups: computers, single-cpu, lenny, porterbox, hasorgfs
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
@@ -349,21 +357,21 @@ servers:
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts
-  carver:
-    address: 128.31.0.50
-    parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts, bind9-hosts
+  #carver:
+  #  address: 128.31.0.50
+  #  parents: gw-mit-csail
+  #  hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, heavy-exim, lenny
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, spamd, heavy-exim, lenny
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs, hasorgfs
 
   argento:
     address: 93.94.130.160
@@ -374,25 +382,30 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts, hasorgfs, heavy-exim
     contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, lenny, hasusrfs
+    hostgroups: computers, porterbox, sw-raid, lenny, hasusrfs, hasorgfs
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, ntpsuckers
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, ntpsuckers
+    contacts: tjrc1
+  sibelius:
+    address: 193.62.202.28
+    parents: gw-sanger
+    hostgroups: computers, lenny, acpid-hosts
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -414,7 +427,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs
     contacts: joerg
 
   schumann:
@@ -428,15 +441,15 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts, kvmdomains
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, kvmdomains
 
   caballero:
     address: 193.201.200.200
@@ -446,7 +459,7 @@ servers:
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart, lenny
+    hostgroups: computers, porterbox, single-cpu, smart, lenny, hasorgfs
 
   kassia:
     address: 130.89.149.224
@@ -479,67 +492,67 @@ servers:
   spontini:
     address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, lenny, hasorgfs
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
     parents: gw-ubcnew
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
   dijkstra:
-    address: 137.82.84.70
-    parents: gw-ubc
+    address: 206.12.19.218
+    parents: gw-ubcnew
     hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
   luchesi:
     address: 206.12.19.214
     parents: gw-ubcnew
     hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts
   wolkenstein:
-    address: 137.82.84.89
+    address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, kvmdomains
   brahms:
-    address: 137.82.84.74
+    address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs, kvmdomains
   geo2:
-    address: 137.82.84.71
+    address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts, kvmdomains
   duarte:
-    address: 137.82.84.77
+    address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
   valente:
-    address: 137.82.84.76
+    address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts
+    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid, heavy-exim
   morricone:
-    address: 137.82.84.81
-    parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
+    address: 206.12.19.9
+    parents: gw-ubcnew
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
   paganini:
-    address: 137.82.84.82
-    parents: gw-ubc
+    address: 206.12.19.10
+    parents: gw-ubcnew
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   respighi:
     address: 137.82.84.83
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   vivaldi:
-    address: 137.82.84.84
-    parents: gw-ubc
+    address: 206.12.19.12
+    parents: gw-ubcnew
     hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   # MSA 2000 (2012i)
   giustini:
@@ -549,15 +562,23 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
+  fano:
+    address: 206.12.19.110
+    parents: luchesi
+    hostgroups: freebsd
+  finzi:
+    address: 206.12.19.111
+    parents: luchesi
+    hostgroups: freebsd
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, lenny
+    hostgroups: computers, buildd, sw-raid, lenny, hasorgfs
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, hasorgfs
 
   tartini:
     address: 82.94.249.158
@@ -567,7 +588,7 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, lenny, hasbootfs, incomingmailrelayed2025
+    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, lenny, hasbootfs, incomingmailrelayed2025, hasorgfs
     contacts: holger
 
   rem:
@@ -578,12 +599,16 @@ servers:
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs, ntpsuckers
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
     hostgroups: computers, porterbox, lenny, hassrvfs
+  zandonai:
+    address: 80.245.147.46
+    parents: gw-HP-ftc
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   escher:
     address: 213.188.99.215
@@ -592,23 +617,72 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny
+    hostgroups: computers, single-cpu, hasbootfs, lenny, ntpsuckers
 
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, dl360, bind9-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, dl360, bind9-hosts, hasorgfs
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
     hostgroups: computers, buildd, lenny, sw-raid, hassrvfs, hasbootfs
 
+  grieg:
+    address: 194.177.211.200
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  rautavaara:
+    address: 194.177.211.199
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  fasch:
+    address: 194.177.211.201
+    parents: gw-grnet
+    hostgroups: freebsd
+  holter:
+    address: 194.177.211.202
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  barber:
+    address: 194.177.211.203
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, buildd, hassrvfs
+  biber:
+    address: 194.177.211.204
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, buildd, hassrvfs
+  cilea:
+    address: 194.177.211.205
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  vitry:
+    address: 194.177.211.206
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  krenek:
+    address: 194.177.211.207
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  scelsi:
+    address: 194.177.211.208
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  orff:
+    address: 194.177.211.209
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  field:
+    address: 194.177.211.210
+    parents: gw-grnet
+    hostgroups: freebsd
+
 #############################
 # host groups
 #
@@ -630,6 +704,10 @@ hostgroups:
     alias: Systems too slow to run any real checks
   dialup:
     alias: Systems with slow network
+  freebsd:
+    # no nrpe yet
+    alias: freebsd
+    private: 1
 
   porterbox:
     alias: developer accessible porter machines
@@ -682,11 +760,18 @@ hostgroups:
     alias: hosts not running samhain properly
     private: 1
 
+  kvmdomains:
+    alias: Hosts that are KVM domains
+    private: 1
+
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
   heavy-exim:
-    alias: "hosts running the full mail stuff, including clamav, SA, and postgrey"
+    alias: "hosts running the full mail stuff, including clamav and postgrey"
+    private: 1
+  spamd:
+    alias: "hosts running spamassassin as daemon"
     private: 1
   heavy-postfix:
     alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"
@@ -730,6 +815,9 @@ hostgroups:
   acpid-hosts:
     alias: hosts running acpid
     private: 1
+  uploadqueue:
+    alias: hosts that are an anonymous ftp uploadqueue
+    private: 1
 
   nfs-client:
     alias: hosts mounting filesystems using NFS
@@ -755,6 +843,9 @@ hostgroups:
   hassrvfs:
     alias: hosts with a /srv filesystem
     private: 1
+  hasorgfs:
+    alias: hosts with a /org filesystem
+    private: 1
   hashomefs:
     alias: hosts with a /home filesystem
     private: 1
@@ -774,6 +865,10 @@ hostgroups:
     # i.e. no port 25
     private: 1
 
+  ntpsuckers:
+    alias: hosts who's ntp offset is often unknown
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -831,12 +926,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries, klecker
+    excludehosts: ries, klecker, kassia
   -
     name: disk usage on /
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /"
-    hosts: ries, klecker
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
+    hosts: ries, klecker, kassia
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -851,7 +946,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
+    hostgroups: hasorgfs
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -871,7 +966,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1025,7 +1120,7 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
-    excludehosts: zelenka
+    excludehosts: zelenka, zandonai
  ####
   -
     name: process - sshd
@@ -1109,6 +1204,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: zelenka, ancina
+    excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
@@ -1142,17 +1238,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, byrd
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel
+    excludehosts: master, rietz, merkel, byrd
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz, merkel
+    hosts: master, rietz, merkel, byrd
  ###
   -
     name: process - clamav - clamd
@@ -1180,8 +1276,8 @@ services:
   -
     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: heavy-exim
-    excludehosts: rietz, merkel, raff, powell, bellini
+    hostgroups: spamd
+    excludehosts: powell
   -
     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'"
@@ -1194,9 +1290,8 @@ services:
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:11 -c 1: -C spamd -a 'spamd child'"
     hosts: liszt
-    hostgroups: heavy-exim
+    hostgroups: spamd
     depends: process - spamd - master
-    excludehosts: rietz, merkel, raff, bellini
   #
   -
     name: process - spamd - master
@@ -1211,12 +1306,8 @@ services:
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
-    excludehostgroups: heavy-exim
-    excludehosts: liszt
-  -
-    name: unwanted process - spamd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
-    hosts: merkel, raff, bellini
+    excludehostgroups: spamd
+    excludehosts: liszt, rietz
 
  ###
   #-
@@ -1480,6 +1571,23 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+ ###
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
+    normal_check_interval: 120
+    hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: villa, lobos, liszt, senfl, schein, rore
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
+    normal_check_interval: 120
+    hosts: villa, lobos, liszt
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
+    normal_check_interval: 120
+    hosts: senfl, schein, rore
  ###
   -
     name: RAID - areca
@@ -1539,7 +1647,7 @@ services:
     name: unexpected process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
     hostgroups: computers
-    excludehostgroups: acpid-hosts
+    excludehostgroups: acpid-hosts, kvmdomains
 
  ###
   -
@@ -1608,7 +1716,7 @@ services:
     depends: kassia:process - apache2 - master
     hosts: kassia-sec, kassia-ftp, kassia-volatile
 
-  # keyserver on raff
+  # keyserver on kaufmann
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
@@ -1619,20 +1727,20 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi, liszt, spohr, widor, rietz
+    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
     # ries		ftp-master.debian.org
-    # klecker		security-master.debian.org
+    # chopin		security-master.debian.org
     # spohr		rt.debian.org
     # spohr2		nagios.debian.org
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor, rietz
+    hosts: ries, chopin, spohr, spohr2, draghi, merkel2, liszt, widor, rietz
     depends: network service - https
     normal_check_interval: 60
 
@@ -1680,17 +1788,17 @@ services:
   -
     name: process - vsftp - listener
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C vsftpd -a 'vsftpd: LISTENER'"
-    hostgroups: ftpd-hosts
+    hostgroups: ftpd-hosts, uploadqueue
     excludehosts: kassia
   -
     name: process - vsftp - instance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
-    hostgroups: ftpd-hosts
+    hostgroups: ftpd-hosts, uploadqueue
     excludehosts: kassia
   -
     name: network service - ftp
     check: check_ftp
-    hostgroups: ftpd-hosts
+    hostgroups: ftpd-hosts, uploadqueue
     excludehosts: kassia
     depends: process - vsftp - listener
   -
@@ -1702,8 +1810,8 @@ services:
  ####
   -
     name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
-    hosts: ries, ravel, klecker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u dak -C debianqueued"
+    hostgroups: uploadqueue
 
  ###
   #-
@@ -1800,7 +1908,7 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     contacts: luk
 
@@ -1847,7 +1955,7 @@ services:
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-    hosts: merkel, raff
+    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
@@ -1863,6 +1971,10 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: mirror sync - volatile
+    check: "dsa_check_mirrorsync!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org"
+    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
@@ -1928,3 +2040,8 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
     runfrom: dijkstra
     hosts: giustini
+  -
+    name: event log
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=0 $HOSTADDRESS$ public"
+    runfrom: dijkstra
+    hosts: giustini