Add kaufmann
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index 7295cb7..836e83b 100644 (file)
@@ -98,10 +98,6 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
-  gw-xandros:
-    address: 67.210.160.81
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -156,6 +152,14 @@ servers:
     address: 130.239.18.97
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-esiee:
+    address: 147.215.2.249
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-ghent:
+    address: 193.191.17.50
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -165,78 +169,82 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-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, puppet
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs
   gluck:
     address: 192.25.206.10
     parents: spohr
-    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, puppet
+    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, hasvarfs, hasusrfs
   merkel:
     address: 192.25.206.16
     parents: spohr
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny, puppet
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+  merkel2:
+    address: 192.25.206.71
+    parents: merkel
+    hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, puppet
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim
   spohr2:
     address: 192.25.206.38
-    parents: rietz
+    parents: spohr
     hostgroups: secondary-IPs
   peri:
     address: 192.25.206.15
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: spohr
-    hostgroups: computers, buildd, lenny, puppet
+    hostgroups: computers, buildd, lenny
   paer:
     address: 192.25.206.11
     parents: spohr
-    hostgroups: computers, porterbox, lenny, hasbootfs, puppet
+    hostgroups: computers, porterbox, lenny, hasbootfs, hashomefs, single-cpu
   merulo:
     address: 192.25.206.58
     parents: spohr
-    hostgroups: computers, porterbox, lenny, puppet
+    hostgroups: computers, porterbox, lenny, hasusrfs
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, lenny, puppet
+    hostgroups: computers, service, dl385, bind9-hosts, lenny, hasvarfs
     contacts: joerg, bzed
-  morales:
-    address: 82.195.75.97
-    parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs
-    contacts: bzed
+  #morales:
+  #  address: 82.195.75.97
+  #  parents: gw-man-da
+  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
+  #  contacts: bzed
   sperger:
     address: 82.195.75.98
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny, hassrvfs
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs
     contacts: bzed
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, lenny
     contacts: bzed
 #  auber:
 #    address: 82.195.75.101
@@ -246,43 +254,50 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny, puppet
+    hostgroups: computers, service, dl360, acpid-hosts, lenny
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs, puppet
-
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, puppet
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, bind9-hosts
+  draghi:
+    address: 82.195.75.106
+    parents: unger
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
+  kaufmann:
+    address: 82.195.75.107
+    parents: unger
+    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts
 
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny, puppet
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload, lenny
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny, puppet
+    hostgroups: computers, general, dl380, acpid-hosts, lenny, buildd, hasbootfs, hassrvfs
 
   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, puppet
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, lenny, puppet, smart
+    hostgroups: computers, buildd, lenny, smart
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -295,64 +310,76 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
 
   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, puppet
+    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, rsyslog-hosts, puppet
+    hostgroups: computers, single-cpu, lenny, porterbox
+  rore:
+    address: 128.31.0.49
+    parents: gw-mit-csail
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+  senfl:
+    address: 128.31.0.51
+    parents: gw-mit-csail
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-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, postgres83-hosts, heavy-exim, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, puppet, hassrvfs
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs
     contacts: bzed
 
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, puppet, rsyslog-hosts, acpid-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, acpid-hosts
     contacts: bzed
 
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, lenny, hasusrfs
 
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny
     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, puppet
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, lenny
     contacts: tjrc1
 
   verdi:
@@ -363,66 +390,51 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, puppet, lenny
+    hostgroups: computers, buildd, lenny, hasvarfs, hashomefs
     contacts: sfrost
 
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, puppet, hassrvfs
+    hostgroups: computers, buildd, lenny, ulogd-hosts, hassrvfs
     contacts: joerg
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet, hassrvfs
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, hassrvfs, hasvarfs, hasusrfs
     contacts: joerg
 
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny, puppet
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, lenny
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts, hassrvfs
+    hostgroups: computers, ulogd-hosts, lenny, hassrvfs
+  geo3:
+    address: 195.20.242.125
+    parents: schumann
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid, lenny, puppet
-
-  elara:
-    address: 67.210.160.90
-    parents: gw-xandros
-    hostgroups: deadslow
-  europa:
-    address: 67.210.160.89
-    parents: gw-xandros
-    hostgroups: deadslow
-
-  kullervo:
-    address: 217.114.76.82
-    parents: gw-nmmn
-    hostgroups: deadslow
-    contacts: luk
-  crest:
-    address: 217.114.76.83
-    parents: gw-nmmn
-    hostgroups: deadslow
-    contacts: luk
+    hostgroups: computers, no-udev, buildd, sw-raid, lenny
+
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart, lenny, puppet
+    hostgroups: computers, porterbox, single-cpu, smart, lenny
 
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, incomingmailrelayed
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -436,10 +448,10 @@ servers:
     parents: kassia
     hostgroups: secondary-IPs
 
-  allegri:
-    address: 157.193.39.233
-    parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs
+  ancina:
+    address: 157.193.39.13
+    parents: gw-ghent
+    hostgroups: computers, buildd, single-cpu, lenny, hassrvfs, hasbootfs, incomingmailrelayed2025
     contacts: luk
 
   agnesi:
@@ -450,78 +462,103 @@ servers:
   spontini:
     address: 137.82.84.65
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny
     contacts: lfilipoz
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, puppet
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
-    hostgroups: computers, bl460, rsyslog-hosts, acpid-hosts, lenny, puppet
+    hostgroups: computers, bl460, acpid-hosts, lenny
   brahms:
     address: 137.82.84.74
     parents: dijkstra
-    hostgroups: computers, lenny, puppet, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs
   geo2:
     address: 137.82.84.71
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, puppet
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
+  duarte:
+    address: 137.82.84.77
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, hassrvfs
+  valente:
+    address: 137.82.84.76
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, single-cpu
+  bellini:
+    address: 137.82.84.79
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, nfs-client, hashomefs, hassrvfs
+  stabile:
+    address: 137.82.84.72
+    parents: gw-ubc
+    hostgroups: computers, lenny, hashomefs, sw-raid
+  cimarosa:
+    address: 137.82.84.80
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts, puppet
+    hostgroups: computers, buildd, sw-raid, lenny
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, lenny, hasvarfs, hasusrfs
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, puppet
+    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, lenny, hasbootfs, incomingmailrelayed2025
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, hasbootfs, lenny, hashomefs
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, puppet
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, lenny, puppet, hassrvfs
+    hostgroups: computers, porterbox, lenny, hassrvfs
 
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet
+    hostgroups: computers, single-cpu, hasbootfs, lenny
 
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, dl360, bind9-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
+    hostgroups: computers, buildd, lenny
+
+  lafayette:
+    address: 147.215.7.160
+    parents: gw-esiee
+    hostgroups: computers, buildd, lenny, sw-raid, hassrvfs, hasbootfs
 
 #############################
 # host groups
@@ -565,11 +602,6 @@ hostgroups:
     extinfo-icon_image: base/debian.png
     extinfo-icon_image_alt: Debian GNU/Linux
     extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
-  puppet:
-    alias: Hosts running puppet
-    extinfo-icon_image: base/debian.png
-    extinfo-icon_image_alt: Debian GNU/Linux
-    extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
 
   dl380:
     alias: HP DL380 hosts
@@ -601,9 +633,9 @@ hostgroups:
   #syslog-ng-hosts:
   #  alias: hosts running syslog-ng instead of sysklogd
   #  private: 1
-  rsyslog-hosts:
-    alias: hosts running rsyslogd instead of sysklogd
-    private: 1
+  #rsyslog-hosts:
+  #  alias: hosts running rsyslogd instead of sysklogd
+  #  private: 1
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -616,9 +648,6 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
-  apache1-hosts:
-    alias: hosts running apache1
-    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -672,12 +701,29 @@ hostgroups:
     alias: hosts with smartd
     private: 1
   hasbootfs:
-    alias: hosts with a /boot
+    alias: hosts with a /boot filesystem
     private: 1
   hassrvfs:
-    alias: hosts with a /srv
+    alias: hosts with a /srv filesystem
+    private: 1
+  hashomefs:
+    alias: hosts with a /home filesystem
+    private: 1
+  hasvarfs:
+    alias: hosts with a /var filesystem
+    private: 1
+  hasusrfs:
+    alias: hosts with a /usr filesystem
     private: 1
 
+  incomingmailrelayed:
+    alias: incoming mail needs to go through a mail relay
+    # i.e. no port 25
+    private: 1
+  incomingmailrelayed2025:
+    alias: incoming mail needs to go through a mail relay
+    # i.e. no port 25
+    private: 1
 
 #############################
 # servicegroups
@@ -751,12 +797,12 @@ services:
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, tartini, morales, powell, escher
+    hostgroups: hasvarfs
   -
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
+    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -776,17 +822,17 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, merulo, tartini, morales, powell
+    hostgroups: hasusrfs
   -
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: voltaire, rem, ball, paer, escher
+    hostgroups: hashomefs
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -807,6 +853,26 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
     hosts: caballero
+  -
+    name: disk usage on /var/lib/postgresql
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
+    hosts: samosa
+  -
+    name: disk usage on /srv/morgue.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    hosts: stabile
+  -
+    name: disk usage on /srv/mirrors
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+    hosts: stabile
+  -
+    name: disk usage on /srv/ftp-master.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org"
+    hosts: stabile
 
  ############ All Computers ############
  ####
@@ -846,12 +912,14 @@ services:
   -
     name: process - puppet
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C ruby -a 'ruby /usr/sbin/puppetd -w 5 --factsync'"
-    hostgroups: puppet
+    hostgroups: lenny
+    excludehosts: agnesi
 
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-puppet"
-    hostgroups: puppet
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -f /var/lib/puppet/state/state.yaml"
+    hostgroups: lenny
+    excludehosts: agnesi
 
  ####
   -
@@ -899,6 +967,11 @@ services:
     name: processes - total
     nrpe: "/usr/lib/nagios/plugins/check_procs 620 700"
     hostgroups: computers
+    excludehosts: liszt
+  -
+    name: processes - total
+    nrpe: "/usr/lib/nagios/plugins/check_procs 800 1000"
+    hosts: liszt
  ####
   -
     name: swap usage - percent
@@ -928,12 +1001,6 @@ services:
     normal_check_interval:  60
     notification_interval: 1440
 
-  -
-    name: "network service - sshd"
-    check: dsa_check_ssh
-    hostgroups: deadslow
-    excludehosts: agnesi
-    normal_check_interval:  180
   -
     name: "network service - sshd - 2260"
     check: dsa_check_ssh_port!2260
@@ -950,15 +1017,8 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd
     hostgroups: computers, deadslow
-    excludehosts: crest, kullervo
     excludehostgroups: lenny
     normal_check_interval:  60
-  -
-    name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1"
-    depends: network service - sshd
-    hosts: crest, kullervo
-    normal_check_interval:  60
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
@@ -1015,12 +1075,12 @@ services:
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: allegri, zelenka
+    excludehosts: zelenka, ancina
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: allegri, zelenka
+    hosts: zelenka, ancina
     depends: process - xinetd
 
  ###
@@ -1034,27 +1094,26 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
     hostgroups: computers
 
- ###
- # -
- #   name: process - syslog-ng
- #   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: syslog-ng-hosts
  ###
   -
-    name: process - rsyslogd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
-    hostgroups: rsyslog-hosts
+    name: process - syslog-ng
+    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: lenny
+    excludehosts: agnesi
+ ###
+ # -
+ #   name: process - rsyslogd
+ #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
+ #   hostgroups: rsyslog-hosts
  ###
   -
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
-    hostgroups: computers
-    excludehostgroups: rsyslog-hosts
+    hosts: rietz, verdi
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
-    hostgroups: computers
-    excludehostgroups: rsyslog-hosts
+    hosts: rietz, verdi
 
  ### MAIL STUFF
  ###
@@ -1092,6 +1151,7 @@ services:
     name: process - clamav - getsigs
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C getclamsigs -a 'getclamsigs'"
     hostgroups: heavy-exim, heavy-postfix
+    excludehosts: master, powell
   #
   -
     name: unwanted process - clamav
@@ -1108,12 +1168,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C getclamsigs"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+    hosts: master, 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 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: heavy-exim
-    excludehosts: rietz, merkel, raff
+    excludehosts: rietz, merkel, raff, 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'"
+    hosts: 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 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1288,24 +1353,29 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: computers
-    excludehostgroups: postfix-hosts
+    excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025
     depends: process - exim
 
   -
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri, piatti
+    excludehosts: verdi
     depends: process - postfix - master
   -
-    name: network service - smtp - port 2025
+    name: network service - submission
+    check: dsa_check_smtp_port!587
+    hostgroups: incomingmailrelayed
+    depends: process - exim
+  -
+    name: network service - smtp 2025
     check: dsa_check_smtp_port!2025
-    hosts: verdi, kassia, murphy, allegri, piatti
-    depends: process - postfix - master
+    hostgroups: incomingmailrelayed2025
+    depends: process - exim
   -
-    name: network service - smtp - port 8080
-    check: dsa_check_smtp_port!8080
-    hosts: murphy
+    name: network service - smtp - port 2025
+    check: dsa_check_smtp_port!2025
+    hosts: verdi
     depends: process - postfix - master
   -
     name: network service local - smtps cert
@@ -1393,6 +1463,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
     hostgroups: sw-raid
 
+ ###
+  -
+    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 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: lenny
+    excludehosts: agnesi
  ###
   -
     name: process - cpqarrayd
@@ -1439,7 +1515,7 @@ services:
   -
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
-    hosts: samosa
+    hosts: draghi
  ###
   -
     name: process - ulogd
@@ -1475,19 +1551,19 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, allegri, gluck, zelenka
+    hosts: gluck, zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, allegri, gluck, zelenka
+    excludehosts: gluck, zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
     check: check_tcp!79
-    hosts: samosa
+    hosts: draghi
     depends: process - xinetd
  ###
   -
@@ -1525,6 +1601,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+
   -
     name: network service - http
     check: check_http
@@ -1538,37 +1615,42 @@ services:
     hosts: kassia-sec, kassia-ftp
 
 
+  # apache1 process on merkel
   -
     name: process - apache - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
+    hosts: merkel
   -
     name: process - apache - worker
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
-    depends: process - apache - master
-  -
-    name: network service - http
-    check: check_http
-    hostgroups: apache1-hosts
+    hosts: merkel
     depends: process - apache - master
 
+  # keyserver on raff
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
     depends: process - apache2 - master
 
+  # https on various hosts
   -
     name: network service - https
     check: check_https
-    hosts: samosa, ries, klecker
+    hosts: ries, klecker, draghi, liszt, spohr
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa, ries, klecker, spohr2
+    # ries             ftp-master.debian.org
+    # klecker          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
     depends: network service - https
     normal_check_interval: 60
 
@@ -1584,6 +1666,18 @@ services:
     check: check_http
     hosts: spohr2
     depends: "spohr:process - apache2 - master"
+  # merkel
+  -
+    name: network service - https
+    check: check_https
+    hosts: merkel2
+    depends: "merkel:process - apache2 - master"
+    normal_check_interval: 120
+  -
+    name: network service - http
+    check: check_http
+    hosts: merkel2
+    depends: "merkel:process - apache2 - master"
  ####
   -
     name: process - named
@@ -1654,11 +1748,11 @@ services:
     name: process - postresql83 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
     hostgroups: postgres83-hosts
-    excludehosts: piatti, klecker
-  -
-    name: process - postresql83 - master udd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
-    hosts: piatti
+    excludehosts: klecker
+  #-
+  #  name: process - postresql83 - master udd
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
+  #  hosts: piatti
   -
     name: process - postresql83 - dak master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
@@ -1682,7 +1776,7 @@ services:
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
-    hosts: piatti
+    hosts: samosa
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"
@@ -1764,9 +1858,17 @@ services:
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
     hosts: merkel, raff
+  -
+    name: nfs mount ftp archive
+    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
+    hosts: bellini
 
  ############ MISC OTHER Stuff ############
  #####
+  -
+    name: mirror sync - bugs
+    check: "dsa_check_mirrorsync!bugs.debian.org!project/trace/bugs-master.debian.org"
+    hosts: global
   -
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
@@ -1779,25 +1881,29 @@ services:
     name: mirror sync - security.us
     check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: DNS SOA sync - security.geo.debian.org
+    check: "dsa_check_soas!security.geo.debian.org"
+    hosts: global
   -
     name: DNS SOA sync - debian.org
-    check: "dsa_check_soas_add!samosa.debian.org!debian.org"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.org"
     hosts: global
   -
     name: DNS SOA sync - debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.net"
     hosts: global
   -
     name: DNS SOA sync - debian.com
-    check: "dsa_check_soas_add!samosa.debian.org!debian.com"
+    check: "dsa_check_soas_add!draghi.debian.org!debian.com"
     hosts: global
   -
     name: DNS SOA sync - mirror.debian.net
-    check: "dsa_check_soas_add!samosa.debian.org!mirror.debian.net"
+    check: "dsa_check_soas_add!draghi.debian.org!mirror.debian.net"
     hosts: global
   -
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
-    check: "dsa_check_soas_add!samosa.debian.org!144-28.118.59.86.in-addr.arpa"
+    check: "dsa_check_soas_add!draghi.debian.org!144-28.118.59.86.in-addr.arpa"
     hosts: global
   -
     name: DNS SOA sync - alioth.debian.org