vivaldi has apache and pg
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index c26f820..d6a7e77 100644 (file)
@@ -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:
@@ -177,15 +177,15 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres84-hosts, bind9-hosts, xinetd-hosts
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
   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, ulogd-hosts, xinetd-hosts
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, xinetd-hosts
   merkel2:
     address: 192.25.206.71
     parents: merkel
@@ -193,25 +193,25 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, nfs-server, spamd, heavy-exim, bind9-hosts
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hasbootfs
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hasbootfs, single-cpu, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs
     contacts: dannf
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-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,38 +219,37 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts, ulogd-hosts
+    hostgroups: computers, buildd, acpid-hosts
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs, ulogd-hosts
+    hostgroups: computers, service, dl385, bind9-hosts, hasvarfs
     contacts: joerg, bzed
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc
     contacts: bzed
   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, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, 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
     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, acpid-hosts
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -258,31 +257,27 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts, kvmdomains, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts
   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, ntpsuckers, ulogd-hosts
+    hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
   purcell:
     address: 82.195.75.69
     parents: gw-man-da
-    hostgroups: computers, buildd, single-cpu, ulogd-hosts
+    hostgroups: computers, buildd
 
   master:
     address: 70.103.162.29
@@ -291,26 +286,31 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, ulogd-hosts
+    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs
 
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, xinetd-hosts
+
+  franck:
+    address: 128.148.34.3
+    parents: gw-brown.edu
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
 
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs
   mayr:
     address: 140.211.166.58
     parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs
   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
@@ -318,45 +318,45 @@ 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
-    hostgroups: computers, porterbox, hassrvfs, hasbootfs
+    hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc
 
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, hasorgfs, xinetd-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
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, hassrvfs, apache2-hosts, rsyncd-hosts, bind9-hosts, xinetd-hosts
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
-  #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs, ulogd-hosts
+  #  hostgroups: computers, service, dl380, acpid-hosts, hassrvfs
 
   klecker:
     address: 194.109.137.218
@@ -366,18 +366,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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts
 
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hassrvfs
     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:
@@ -389,13 +389,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, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -405,42 +405,37 @@ servers:
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, sparc
     contacts: tjrc1
 
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, hasvarfs, hashomefs, ulogd-hosts
+    hostgroups: computers, buildd, hasvarfs, hashomefs
     contacts: sfrost
 
-  puccini:
-    address: 87.106.4.56
-    parents: gw-1und1
-    hostgroups: computers, buildd, ulogd-hosts, hassrvfs
-    contacts: joerg
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
+    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts
     contacts: joerg
 
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts
+    hostgroups: computers, acpid-hosts
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, ulogd-hosts, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, ulogd-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts
   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
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -449,17 +444,17 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid
 
   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
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, incomingmailrelayed, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, incomingmailrelayed, xinetd-hosts
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -476,7 +471,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts
     contacts: luk
 
   agnesi:
@@ -496,26 +491,26 @@ servers:
   dijkstra:
     address: 206.12.19.218
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
+    hostgroups: computers, bl460, acpid-hosts
   luchesi:
     address: 206.12.19.214
     parents: tchaikovsky
-    hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
+    hostgroups: computers, bl460, acpid-hosts
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu, ulogd-hosts
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains
+    hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, kvmdomains
   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
   duarte:
     address: 206.12.19.114
     parents: dijkstra
@@ -523,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
@@ -531,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, postgres84-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
@@ -551,7 +546,7 @@ servers:
   vivaldi:
     address: 206.12.19.12
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, apache2-hosts, postgres84-hosts
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -571,36 +566,40 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
-    hostgroups: computers, single-cpu 
+    hostgroups: computers, porterbox
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
-    hostgroups: computers, single-cpu, buildd, ulogd-hosts
+    hostgroups: computers, buildd
+  lucatelli:
+    address: 206.12.19.15
+    parents: tchaikovsky
+    hostgroups: computers, buildd
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc
 
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, hasvarfs, hasusrfs
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs
 
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs
+    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs
     contacts: holger
 
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, hashomefs, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs, hashomefs
 
   zelenka:
     address: 80.245.147.40
@@ -609,31 +608,31 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs
 
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, ntpsuckers, ulogd-hosts
+    hostgroups: computers, hasbootfs, ntpsuckers
 
   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, ulogd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, bind9-hosts, hasorgfs, xinetd-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs
   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, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
 
   grieg:
     address: 194.177.211.200
@@ -642,7 +641,7 @@ servers:
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, ulogd-hosts, megaraid
+    hostgroups: computers, acpid-hosts, megaraid
   fasch:
     address: 194.177.211.201
     parents: rautavaara
@@ -651,19 +650,19 @@ servers:
   holter:
     address: 194.177.211.202
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, mptraid
+    hostgroups: computers, acpid-hosts, hassrvfs, apache2-hosts, mptraid
   barber:
     address: 194.177.211.203
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
   biber:
     address: 194.177.211.204
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, ulogd-hosts
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid
   cilea:
     address: 194.177.211.205
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, hassrvfs
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
@@ -689,15 +688,19 @@ servers:
   beethoven:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, ulogd-hosts
+    hostgroups: computers, hasbootfs, aacraid, nfs-server
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts
+    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, spamd, heavy-exim
+    hostgroups: computers, acpid-hosts
     # which raid?
   lindberg:
     address: 86.59.118.149
@@ -728,6 +731,9 @@ hostgroups:
   freebsd:
     alias: freebsd
     private: 1
+  sparc:
+    alias: sparc
+    private: 1
 
   porterbox:
     alias: developer accessible porter machines
@@ -774,9 +780,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
@@ -837,8 +840,8 @@ hostgroups:
   no-udev:
     alias: hosts not using udev
     private: 1
-  ulogd-hosts:
-    alias: hosts running ulogd
+  no-ulogd:
+    alias: hosts not running ulogd
     private: 1
   acpid-hosts:
     alias: hosts running acpid
@@ -947,7 +950,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 /
@@ -994,7 +997,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
+    hosts: saens, merkel, tartini, powell, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1019,7 +1022,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
@@ -1030,7 +1039,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
@@ -1042,25 +1051,45 @@ 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-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-0123"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-67"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-4567
+    name: disk usage on /srv/farm-snapshot/farm-89
     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-89"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-89ab
+    name: disk usage on /srv/farm-snapshot/farm-abf
     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-abf"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-cdef
+    name: disk usage on /srv/farm-snapshot/farm-cde
     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-cde"
     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
 
  ############ All Computers ############
  ####
@@ -1103,6 +1132,13 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: computers
 
+ ####
+  -
+    name: installed firewall
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
+    hostgroups: computers
+    excludehostgroups: freebsd
+
  ####
   -
     name: process - samhain
@@ -1132,11 +1168,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
@@ -1257,7 +1293,18 @@ 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
 
+  -
+    name: remote logging
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: heininen
+    hostgroups: computers
  ### MAIL STUFF
  ###
   -
@@ -1265,17 +1312,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
@@ -1323,18 +1370,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
 
  ###
   #-
@@ -1506,15 +1553,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
 
  ####
  ###
@@ -1544,7 +1586,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"
@@ -1578,14 +1620,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
@@ -1596,6 +1632,12 @@ services:
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: franck
+  -
+    name: RAID - arrayprobe
+    servicegroups: raid
+    nrpe: "sudo /usr/bin/arrayprobe -f /dev/cciss/c1d0"
+    hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -1643,11 +1685,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
     hostgroups: megaraid
  ###
-  -
-    name: RAID - 3ware
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
-    hosts: puccini
+  #-
+  #  name: RAID - 3ware
+  #  servicegroups: raid
+  #  nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
+  #  hosts: puccini
  ###
   -
     name: RAID - MPT
@@ -1664,12 +1706,13 @@ services:
   -
     name: process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ulogd -a '/usr/sbin/ulogd -d'"
-    hostgroups: ulogd-hosts
+    hostgroups: computers
+    excludehostgroups: freebsd, sparc
   -
     name: unexpected process - ulogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C ulogd"
-    hostgroups: computers
-    excludehostgroups: ulogd-hosts
+    hostgroups: freebsd, sparc
+
  ###
   -
     name: process - udevd
@@ -1713,23 +1756,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: kassia-sec
-    depends: kassia:process - xinetd
+    hosts: merikanto2
+    depends: merikanto:process - xinetd
 
  ###
   -
@@ -1759,7 +1806,8 @@ services:
     name: network service - http
     check: check_http
     depends: kassia:process - apache2 - master
-    hosts: kassia-sec, kassia-ftp, kassia-volatile
+    #hosts: kassia-sec, kassia-ftp, kassia-volatile
+    hosts: kassia-ftp, kassia-volatile
 
   # keyserver on kaufmann
   -
@@ -1772,7 +1820,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, grieg
+    hosts: ries, franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1785,8 +1833,9 @@ 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, grieg
+    # grieg            buildd.debian.org
+    # vivaldi          fossology.debian.org
+    hosts: ries, franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
     depends: network service - https
     normal_check_interval: 60
 
@@ -1838,7 +1887,8 @@ services:
   -
     name: network service - ftp
     check: check_ftp
-    hosts: kassia-sec, kassia-ftp
+    #hosts: kassia-sec, kassia-ftp
+    hosts: kassia-ftp
     depends: kassia:process - xinetd
 
  ####
@@ -1872,6 +1922,7 @@ services:
     name: process - postresql84 - 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'"
     hostgroups: postgres84-hosts
+    excludehosts: franck
   -
     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'"
@@ -1887,11 +1938,16 @@ services:
   -
     name: process - postresql84 - dak 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 -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-    hosts: ries
+    hosts: franck
   -
     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
+    hosts: franck
+ # backups
+  -
+    name: postgresql backups
+    nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
+    hosts: beethoven
  ####
   -
     name: process - mysql - master
@@ -1937,7 +1993,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
 
@@ -1994,27 +2050,30 @@ 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: DNS SOA sync - security.geo.debian.org
-    check: "dsa_check_soas!security.geo.debian.org"
+    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
+    retry_check_interval: 5
   -
     name: DNS SOA sync - debian.org
     check: "dsa_check_soas_add!draghi.debian.org!debian.org"
@@ -2058,12 +2117,12 @@ services:
   -
     name: DNS SEC - signature expiry
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d /var/cache/bind/git/domains"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d --geozonedir /srv/dns.debian.org/geo/zones /srv/dns.debian.org/var/gitdns/domains"
     runfrom: draghi
   -
     name: DNS SEC - delegations
     hosts: global
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /var/cache/bind/git/domains check-header"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /srv/dns.debian.org/var/gitdns/domains --dir /srv/dns.debian.org/geo/zones check-header"
     runfrom: draghi
 
  ############