projects / mirror / dsa-nagios.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
danzi has xinetd
[mirror/dsa-nagios.git] / config / nagios-master.cfg
diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 7a6cd3e..36e3250 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -56,11 +56,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-mit-csail:
-    address: 128.30.0.254
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
-  gw-xs4all:
-    address: 194.109.137.217
+    address: 128.31.0.1
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-umn.edu:
@@ -81,10 +77,6 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: tjrc1, dave
-  gw-frost:
-    address: 130.81.27.83
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-1und1:
     address: 195.20.247.54
     parents: gw-ubc
@@ -141,10 +133,6 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: holger
-  gw-telefonica:
-    address: 195.71.99.193
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-cst:
     address: 213.157.2.23
     parents: gw-ubc
@@ -190,6 +178,14 @@ servers:
     address: 80.245.144.3
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-karlsruhe:
+    address: 129.143.166.229
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
+  gw-marist:
+    address: 148.100.96.1
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -199,13 +195,13 @@ servers:
   vasks:
     address: 217.196.43.140
     parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https
+    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
 
   wagner:
     address: 217.196.43.132
     parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
 
   samosa:
@@ -216,14 +212,6 @@ servers:
     address: 192.25.206.59
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
-#  merkel:
-#    address: 192.25.206.16
-#    parents: gw-HP-ftc
-#    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts, lenny
-#  merkel2:
-#    address: 192.25.206.71
-#    parents: merkel
-#    hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
@@ -241,7 +229,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, lenny
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -249,7 +237,7 @@ servers:
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasusrfs, lenny
+    hostgroups: computers, porterbox, hasusrfs, squeeze
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
@@ -263,12 +251,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, hassrvfs, lenny
+    hostgroups: computers, porterbox, sw-raid, hassrvfs, squeeze
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -319,10 +307,18 @@ servers:
     address: 82.195.75.92
     parents: unger
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
-  lamb:
-    address: 82.195.75.101
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+#  lamb:
+#    address: 82.195.75.101
+#    parents: unger
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa, bosserver
+  czerny:
+    address: 82.195.75.109
+    parents: gw-man-da
+    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+  new-master:
+    address: 82.195.75.110
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 
   master:
     address: 70.103.162.29
@@ -337,7 +333,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
+    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
 
   franck:
     address: 128.148.34.3
@@ -355,7 +351,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, hasvicepa, squeeze, apache2-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -404,11 +400,6 @@ servers:
   #  parents: gw-mit-csail
   #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs
 
-  klecker:
-    address: 194.109.137.218
-    parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl385, spamd, heavy-exim, xinetd-hosts, lenny
-
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
@@ -417,7 +408,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, hassrvfs, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, squeeze
     contacts: bzed
 
   widor:
@@ -454,12 +445,6 @@ servers:
     hostgroups: computers, porterbox, sw-raid, sparc, squeeze
     contacts: tjrc1, dave
 
-  voltaire:
-    address: 72.66.115.54
-    parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs, lenny
-    contacts: sfrost
-
   powell:
     address: 87.106.64.223
     parents: gw-1und1
@@ -490,7 +475,7 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, lenny
+    hostgroups: computers, buildd, sw-raid, squeeze
 
   pescetti:
     address: 217.114.76.85
@@ -513,6 +498,15 @@ servers:
     address: 130.89.149.227
     parents: kassia
     hostgroups: secondary-IPs
+  klecker:
+    address: 130.89.148.10
+    parents: gw-utwente
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed, hassrvfs
+  klecker-ftp:
+    address: 130.89.148.12
+    parents: klecker
+    hostgroups: secondary-IPs
+
 
   ancina:
     address: 157.193.39.13
@@ -548,7 +542,7 @@ servers:
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, rsyncd-hosts, apache2-hosts, squeeze
   brahms:
     address: 206.12.19.115
     parents: dijkstra
@@ -576,7 +570,7 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, postgres90-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -588,7 +582,7 @@ servers:
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, lenny, autofs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts, service, apache-https, squeeze, autofs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -600,11 +594,11 @@ servers:
   fano:
     address: 206.12.19.110
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   finzi:
     address: 206.12.19.111
     parents: luchesi
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
@@ -633,10 +627,10 @@ servers:
     address: 206.12.19.119
     parents: tchaikovsky
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
-  locke:
-    address: 206.12.19.120
-    parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
+#  locke:
+#    address: 206.12.19.120
+#    parents: tchaikovsky
+#    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
   lotti:
     address: 206.12.19.121
     parents: tchaikovsky
@@ -656,7 +650,7 @@ servers:
   danzi:
     address: 206.12.19.125
     parents: luchesi
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, postgres84-hosts, xinetd-hosts
   glinka:
     address: 206.12.19.126
     parents: traetta
@@ -673,6 +667,22 @@ servers:
     address: 206.12.19.130
     parents: salieri
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  berlioz:
+    address: 206.12.19.131
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs, apache-https
+  gombert:
+    address: 206.12.19.132
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  jenkins:
+    address: 206.12.19.133
+    parents: salieri
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  blavet:
+    address: 206.12.19.134
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, xinetd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -743,7 +753,7 @@ servers:
   fasch:
     address: 194.177.211.201
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
   holter:
     address: 194.177.211.202
@@ -780,7 +790,7 @@ servers:
   field:
     address: 194.177.211.210
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd
+    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
     #, mptraid
 
   beethoven:
@@ -805,31 +815,63 @@ servers:
     parents: gw-sil
     hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, megactl
     # which raid?
+  eder:
+    address: 86.59.118.151
+    parents: gw-sil
+    hostgroups: computers, porterbox, squeeze, hassrvfs
+  eysler:
+    address: 86.59.118.152
+    parents: gw-sil
+    hostgroups: computers, buildd, squeeze
 
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, squeeze
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   arne:
     address: 217.140.96.61
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, squeeze
+  harris:
+    address: 217.140.96.66
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, porterbox
+  hartmann:
+    address: 217.140.96.67
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+  hasse:
+    address: 217.140.96.68
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+  hebden:
+    address: 217.140.96.69
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+  henze:
+    address: 217.140.96.70
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd
+  hoiby:
+    address: 217.140.96.71
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy
 
   poulenc:
     address: 144.32.168.77
@@ -846,6 +888,16 @@ servers:
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
     contacts: faw
 
+  zemlinsky:
+    address: 129.143.160.6
+    parents: gw-karlsruhe
+    hostgroups: computers, buildd, hassrvfs, squeeze
+
+  zappa:
+    address: 148.100.96.103
+    parents: gw-marist
+    hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed
+
 #############################
 # host groups
 #
@@ -926,6 +978,8 @@ hostgroups:
 
   squeeze:
     alias: Hosts running squeeze
+  wheezy:
+    alias: Hosts running wheezy
 
   lenny:
     alias: Hosts running lenny
@@ -1044,9 +1098,9 @@ hostgroups:
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
-  hasvicepa:
-    alias: hosts with a /vicepa
-    private: 1
+#  hasvicepa:
+#    alias: hosts with a /vicepa
+#    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1061,6 +1115,10 @@ hostgroups:
     alias: "hosts who's ntp offset is often unknown"
     private: 1
 
+  brokensamhain:
+    alias: machines that can not run samhain
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -1118,12 +1176,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: klecker, kassia, spohr, liszt
+    excludehosts: kassia, spohr, liszt
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: klecker, kassia, spohr, liszt
+    hosts: kassia, spohr, liszt
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -1139,11 +1197,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-#  -
-#    name: disk usage on /org
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-#    hosts: merkel
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -1155,11 +1208,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hosts: ries
-#  -
-#    name: disk usage on /org/scratch
-#    servicegroups: diskspace
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
-#    hosts: merkel
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1175,11 +1223,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
     hostgroups: hashomefs
-  -
-    name: disk usage on /mnt/hdc
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
-    hosts: voltaire
   -
     name: disk usage on /x
     servicegroups: diskspace
@@ -1197,16 +1240,16 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
     hosts: busoni, wieck, heininen
 
-  -
-    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/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
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
-    hosts: stabile, beethoven, sibelius
+    hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
@@ -1215,48 +1258,58 @@ services:
   -
     name: disk usage on /srv/farm-snapshot/farm-01
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-01"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-01"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-23
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-23"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-23"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-45
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-45"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-45"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-67
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-67"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-67"
     hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-89
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-89"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-89"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-abf
+    name: disk usage on /srv/farm-snapshot/farm-ab
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-abf"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-ab"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-cde
+    name: disk usage on /srv/farm-snapshot/farm-cd
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/farm-snapshot/farm-cd"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-f
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-f"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-e
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-e"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
     hosts: vivaldi
-  -
-    name: disk usage on /vicepa
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
-    hostgroups: hasvicepa
+#  -
+#    name: disk usage on /vicepa
+#    servicegroups: diskspace
+#    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
+#    hostgroups: hasvicepa
   -
     name: disk usage on /var/lib/postgresql/9.0/dak
     servicegroups: diskspace
@@ -1280,6 +1333,7 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
+    excludehostgroups: wheezy
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1308,27 +1362,27 @@ services:
     retry_check_interval: 5
 
  ####
-  - name: afs - space
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
-  - name: afs - bos
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
-  - name: afs - waiting connections
-    hostgroups: bosserver
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
-    normal_check_interval: 60
-    max_check_attempts: 2
-    retry_check_interval: 5
-
+#  - name: afs - space
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-space -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
+#  - name: afs - bos
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-bos -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
+#  - name: afs - waiting connections
+#    hostgroups: bosserver
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-rxdebug -H localhost"
+#    normal_check_interval: 60
+#    max_check_attempts: 2
+#    retry_check_interval: 5
+#
   #- name: afs - udebug
   #  hostgroups: bosserver
   #  nrpe: "/usr/lib/nagios/plugins/dsa-check-afs-udebug -H localhost"
@@ -1362,7 +1416,7 @@ services:
     name: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
-    excludehosts: vasks, wagner
+    excludehostgroups: brokensamhain
   -
     name: samhain
     servicegroups: samhain
@@ -1371,7 +1425,7 @@ services:
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
-    excludehosts: vasks, wagner
+    excludehostgroups: brokensamhain
 
  ####
   -
@@ -1469,12 +1523,15 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
     excludehostgroups: freebsd
-    excludehosts: vasks, wagner
+    excludehosts: vasks, wagner, harris, hartmann, hasse, henze, hebden, hoiby
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
     hostgroups: freebsd
-    excludehosts: vasks, wagner
+  -
+    name: process - munin-node
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin -a '/usr/sbin/munin-node'"
+    hosts: harris, hartmann, hasse, henze, hebden, hoiby
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1523,7 +1580,6 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: freebsd
-    excludehosts: vasks, wagner
 
   -
     name: remote logging
@@ -1804,7 +1860,7 @@ services:
     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
+    hostgroups: unbound-hosts, squeeze, wheezy
  ###
   -
     name: process - uptimed
@@ -1882,13 +1938,6 @@ services:
     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
-  -
-    name: process - cpqarrayd
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
-    hostgroups: dl385, dl380, dl360, bl460, dl585
-    excludehostgroups: squeeze
-    excludehosts: wagner
   -
     name: RAID - arrayprobe
     servicegroups: raid
@@ -1983,7 +2032,7 @@ services:
     name: RAID - megactl
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megactl"
-    hostsgroups: megactl
+    hostgroups: megactl
  ###
   -
     name: process - slapd
@@ -2006,7 +2055,6 @@ services:
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
     hostgroups: freebsd, sparc
-    excludehosts: vasks, wagner
 
  ###
   -
@@ -2029,11 +2077,11 @@ services:
     hostgroups: computers
     excludehostgroups: acpid-hosts, kvmdomains
  ###
-  -
-    name: process - bosserver
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bosserver -a '/usr/sbin/bosserver'"
-    hostgroups: bosserver
-
+#  -
+#    name: process - bosserver
+#    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
@@ -2056,17 +2104,22 @@ services:
     hosts: draghi
     depends: process - xinetd
  ###
-#  -
-#    name: network service - rsync
-#    check: check_tcp!873
-#    hostgroups: rsyncd-hosts
-#    depends: process - xinetd
-#
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hostgroups: rsyncd-hosts
+    depends: process - xinetd
+    excludehosts: merikanto, rietz
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: merikanto2
+    depends: merikanto:process - xinetd
   #-
   #  name: network service - rsync
   #  check: check_tcp!873
@@ -2105,7 +2158,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: kassia
+    excludehosts: kassia, klecker
     depends: process - apache2 - master
   -
     name: network service - http
@@ -2113,6 +2166,11 @@ services:
     depends: kassia:process - apache2 - master
     #hosts: kassia-sec, kassia-ftp, kassia-volatile
     hosts: kassia-ftp, kassia-volatile
+  -
+    name: network service - http
+    check: check_http
+    depends: klecker:process - apache2 - master
+    hosts: klecker-ftp
 
   # keyserver on kaufmann
   -
@@ -2164,17 +2222,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, uploadqueue
-    excludehosts: kassia
+    excludehosts: kassia, klecker
   -
     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, uploadqueue
-    excludehosts: kassia
+    excludehosts: kassia, klecker
   -
     name: network service - ftp
     check: check_ftp
     hostgroups: ftpd-hosts, uploadqueue
-    excludehosts: kassia
+    excludehosts: kassia, klecker
     depends: process - vsftp - listener
   -
     name: network service - ftp
@@ -2182,6 +2240,12 @@ services:
     #hosts: kassia-sec, kassia-ftp
     hosts: kassia-ftp
     depends: kassia:process - xinetd
+  -
+    name: network service - ftp
+    check: check_ftp
+    #hosts: kassia-sec, kassia-ftp
+    hosts: klecker-ftp
+    depends: klecker:process - xinetd
 
  ####
   -
@@ -2273,7 +2337,7 @@ services:
   -
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
-    hostgroups: squeeze
+    hostgroups: squeeze, wheezy
     excludehosts: fano, fasch, field, finzi
  ####
   -
@@ -2315,6 +2379,10 @@ 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
 
  ####
   #-
@@ -2391,10 +2459,6 @@ services:
     hostgroups: nfs-server
  # see if the nfs stuff works and doesn't hang.
   # the df check all script will also hang, but we don't appear to pay attention to that
-#  -
-#    name: nfs mount ftp archive
-#    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-#    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
@@ -2475,10 +2539,6 @@ services:
     name: DNS SOA sync - a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
     hosts: global
-  -
-    name: DNS SOA sync - 2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa"
-    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"
Unnamed repository; edit this file 'description' to name the repository.