X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f54c7eb4a9af092fc2163dfec0e41e0b677c1ee7;hb=36b442bd9996a92442e83dd44b42c7ff155c94b5;hp=68ab4084162f00ccf7bb5c7bef93598c82eea7ae;hpb=2bd3cb314556a83f6c541aac1257c1e42f3b8494;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 68ab408..f54c7eb 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -68,7 +68,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-dg-i.net:
-    address: 93.94.130.190
+    address: 93.94.132.102
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: bzed
@@ -141,7 +141,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-cst:
-    address: 213.157.2.210
+    address: 213.157.2.23
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-isc:
@@ -181,7 +181,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, ulogd-hosts
   merkel:
     address: 192.25.206.16
     parents: gw-HP-ftc
@@ -197,21 +197,21 @@ servers:
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ulogd-hosts
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hasbootfs, single-cpu
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, ulogd-hosts
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasbootfs, hashomefs, single-cpu
+    hostgroups: computers, porterbox, hasbootfs, hashomefs
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
@@ -219,18 +219,13 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts
+    hostgroups: computers, buildd, acpid-hosts, ulogd-hosts
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
     hostgroups: computers, service, dl385, bind9-hosts, hasvarfs, ulogd-hosts
     contacts: joerg, bzed
-  #morales:
-  #  address: 82.195.75.97
-  #  parents: gw-man-da
-  #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, hasvarfs, hasusrfs
-  #  contacts: bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
@@ -239,23 +234,22 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, hassrvfs
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
     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
     contacts: bzed
-#  auber:
-#    address: 82.195.75.101
-#    parents: gw-man-da
-#    hostgroups: computers, no-udev, buildd, sw-raid
-#    contacts: bzed
+  heininen:
+    address: 82.195.75.98
+    parents: gw-man-da
+    hostgroups: computers, ulogd, acpid
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -263,7 +257,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains
+    hostgroups: computers, service, hasbootfs, kvmdomains, ulogd-hosts
   geo1:
     address: 82.195.75.105
     parents: unger
@@ -275,19 +269,15 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains, xinetd-hosts
-  byrd:
-    address: 82.195.75.101
-    parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
+    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts
   ball:
     address: 82.195.75.70
     parents: gw-man-da
-    hostgroups: computers, buildd, no-udev, hasbootfs, hashomefs, ntpsuckers
+    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers, ulogd-hosts
   purcell:
     address: 82.195.75.69
     parents: gw-man-da
-    hostgroups: computers, buildd, single-cpu
+    hostgroups: computers, buildd, ulogd-hosts
 
   master:
     address: 70.103.162.29
@@ -296,7 +286,7 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, ulogd-hosts
 
 
   ries:
@@ -307,19 +297,15 @@ servers:
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
-  malo:
-    address: 140.211.166.27
-    parents: gw-osuosl
-    hostgroups: computers, buildd, smart
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs, etch, xinetd-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -327,7 +313,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -336,24 +322,24 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
   gluck:
     address: 150.203.164.38
     parents: gw-anu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts, ulogd-hosts
 
   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, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, ulogd-hosts
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
-  #  hostgroups: computers, single-cpu, porterbox, hasorgfs
+  #  hostgroups: computers, porterbox, hasorgfs
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
@@ -375,18 +361,18 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, ulogd-hosts
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
     contacts: bzed
 
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, heavy-exim
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs
     contacts: bzed
 
   pergolesi:
@@ -398,13 +384,13 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, 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, ntpsuckers, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, ulogd-hosts
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -420,7 +406,7 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs
+    hostgroups: computers, buildd, hasvarfs, hashomefs, ulogd-hosts
     contacts: sfrost
 
   puccini:
@@ -449,7 +435,7 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -458,12 +444,12 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, no-udev, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, ulogd-hosts
 
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart, hasorgfs
+    hostgroups: computers, porterbox, smart, hasorgfs
 
   kassia:
     address: 130.89.149.224
@@ -485,7 +471,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
     contacts: luk
 
   agnesi:
@@ -512,7 +498,7 @@ servers:
     hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, ulogd-hosts
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
@@ -520,11 +506,11 @@ servers:
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, ulogd-hosts
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
   duarte:
     address: 206.12.19.114
     parents: dijkstra
@@ -532,7 +518,7 @@ servers:
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
@@ -540,7 +526,7 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
@@ -548,11 +534,11 @@ servers:
   cimarosa:
     address: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim, apache2-hosts
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts, nfs-client
   respighi:
     address: 206.12.19.11
     parents: gw-ubc
@@ -577,6 +563,18 @@ servers:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze
+  gabrielli:
+    address: 206.12.19.17
+    parents: tchaikovsky
+    hostgroups: computers
+  corelli:
+    address: 206.12.19.16
+    parents: tchaikovsky
+    hostgroups: computers, buildd, ulogd-hosts
+  lucatelli:
+    address: 206.12.19.15
+    parents: tchaikovsky
+    hostgroups: computers, buildd, ulogd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -585,7 +583,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
   tartini:
     address: 82.94.249.158
@@ -601,7 +599,7 @@ servers:
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, hashomefs
+    hostgroups: computers, buildd, hasbootfs, hashomefs, ulogd-hosts
 
   zelenka:
     address: 80.245.147.40
@@ -610,40 +608,36 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
 
-  escher:
-    address: 213.188.99.215
-    parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, hasbootfs, ntpsuckers, ulogd-hosts
 
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts, ulogd-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs
+    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
-    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs, ulogd-hosts
 
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -660,11 +654,11 @@ servers:
   barber:
     address: 194.177.211.203
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
@@ -694,7 +688,25 @@ servers:
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid
+    hostgroups: computers, hasbootfs, aacraid, ulogd-hosts, nfs-server
+  merikanto:
+    address: 86.59.118.147
+    parents: gw-sil
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts
+  merikanto2:
+    address: 86.59.118.150
+    parents: merikanto
+    hostgroups: secondary-IPs
+  englund:
+    address: 86.59.118.148
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
+  lindberg:
+    address: 86.59.118.149
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
 
 
 #############################
@@ -765,9 +777,6 @@ hostgroups:
   mptraid:
     alias: Hosts with LSI Logic Fusion-MPT
     private: 1
-  single-cpu:
-    alias: Hosts with only one CPU
-    private: 1
 
   etch:
     alias: Hosts running etch
@@ -776,10 +785,6 @@ hostgroups:
     alias: Hosts running squeeze
     private: 1
 
-  no-samhain:
-    alias: hosts not running samhain properly
-    private: 1
-
   kvmdomains:
     alias: Hosts that are KVM domains
     private: 1
@@ -942,7 +947,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
     hostgroups: computers
   -
     name: disk usage on /
@@ -989,7 +994,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: saens, puccini, merkel, tartini, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1014,7 +1019,13 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa, stabile, sibelius
+    hosts: samosa, stabile, sibelius, busoni
+
+  -
+    name: disk usage on /var/log
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
+    hosts: busoni
 
   -
     name: disk usage on /srv/morgue.debian.org
@@ -1025,7 +1036,7 @@ services:
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
-    hosts: stabile
+    hosts: stabile, beethoven, sibelius
   -
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
@@ -1037,24 +1048,39 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/snapshot.debian.org"
     hosts: stabile,sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-0123
+    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"
+    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"
+    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-0123"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-45"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-4567
+    name: disk usage on /srv/farm-snapshot/farm-67
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-4567"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-67"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-89ab
+    name: disk usage on /srv/farm-snapshot/farm-89
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-89ab"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-89"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-cdef
+    name: disk usage on /srv/farm-snapshot/farm-abf
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cdef"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-abf"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-cde
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
     hosts: sibelius
 
  ############ All Computers ############
@@ -1103,13 +1129,11 @@ 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
-    excludehostgroups: no-samhain
   -
     name: samhain
     servicegroups: samhain
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
-    excludehostgroups: no-samhain
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
@@ -1129,11 +1153,11 @@ services:
     name: load
     nrpe: "/usr/lib/nagios/plugins/check_load -w 140,120,100 -c 240,220,200"
     hostgroups: highload
-    excludehosts: rietz
+ ####
   -
-    name: load
-    nrpe: "/usr/lib/nagios/plugins/check_load -w 200,200,200 -c 350,350,350"
-    hosts: rietz
+    name: uptime check
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-uptime"
+    hostgroups: computers
  ####
   -
     name: processes - zombies
@@ -1254,6 +1278,12 @@ services:
     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: computers
+    excludehostgroups: squeeze
+
+  -
+    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: squeeze
 
  ### MAIL STUFF
  ###
@@ -1262,17 +1292,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, byrd
+    excludehosts: master, busoni, merkel
   -
     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, byrd
+    excludehosts: master, busoni, merkel
   -
     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, byrd
+    hosts: master, busoni, merkel
  ###
   -
     name: process - clamav - clamd
@@ -1320,18 +1350,18 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: rietz
+    hosts: busoni
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: rietz
+    hosts: busoni
   #
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, rietz
+    excludehosts: liszt, busoni
 
  ###
   #-
@@ -1503,15 +1533,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
  ###
-  -
-    name: process - irqbalance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
-    hostgroups: computers
-    excludehostgroups: single-cpu, freebsd
   -
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
-    hostgroups: single-cpu, freebsd
+    hostgroups: computers
 
  ####
  ###
@@ -1541,7 +1566,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: rietz, grieg
+    excludehosts: grieg
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1575,14 +1600,8 @@ services:
  ###
   -
     name: process - monit
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    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
-    excludehostgroups: squeeze
-  -
-    name: process - monit
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hostgroups: squeeze
- ###
   -
     name: process - cpqarrayd
     servicegroups: raid
@@ -1710,23 +1729,27 @@ 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
+#
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
-
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: kassia-sec
     depends: kassia:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: merikanto2
+    depends: merikanto:process - xinetd
 
  ###
   -
@@ -1769,7 +1792,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, cimarosa
+    hosts: ries, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1782,8 +1805,8 @@ services:
     # draghi		db.debian.org
     # merkel2		nm.debian.org
     # liszt		lists.debian.org
-    # cimarosa		buildd.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, cimarosa
+    # grieg		buildd.debian.org
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
     depends: network service - https
     normal_check_interval: 60
 
@@ -1889,6 +1912,11 @@ services:
     name: process - postresql84 - dak-dev master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
     hosts: ries
+ # backups
+  -
+    name: postgresql backups
+    nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
+    hosts: beethoven
  ####
   -
     name: process - mysql - master
@@ -1934,7 +1962,7 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -u buildd -C buildd -a '/usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     contacts: luk, pkern, HE
 
@@ -1991,19 +2019,26 @@ services:
  #####
   -
     name: mirror sync - bugs
-    check: "dsa_check_mirrorsync!bugs.debian.org!project/trace/bugs-master.debian.org"
+    check: "dsa_check_mirrorsync_skew!bugs.debian.org!project/trace/bugs-master.debian.org!120:600"
     hosts: global
   -
     name: mirror sync - security
-    check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
+    check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150:3600"
     hosts: global
   -
     name: mirror sync - volatile
-    check: "dsa_check_mirrorsync!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org"
+    check: "dsa_check_mirrorsync_skew!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org!150:3600"
     hosts: global
   -
     name: mirror sync - packages
-    check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
+    check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
+    hosts: global
+    normal_check_interval: 15
+    max_check_attempts: 5
+    retry_check_interval: 5
+  -
+    name: mirror sync - snapshot
+    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!1800:28800"
     hosts: global
     normal_check_interval: 15
     max_check_attempts: 5