chopin has bootfs
[mirror/dsa-nagios.git] / config / nagios-master.cfg
index cf38239..d8f27c8 100644 (file)
@@ -10,7 +10,6 @@
 #  - *: check munin stats collection works
 #  - *: check backups are successful
 #  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
-#  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
 
 # down:
@@ -27,6 +26,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: joerg, bzed
+  gw-man-da2:
+    address: 82.195.75.46
+    parents: gw-man-da
+    hostgroups: routing-infrastructure
+    contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
     parents: spohr
@@ -77,10 +81,6 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: tjrc1
-  gw-lrz:
-    address: 129.187.0.150
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-frost:
     address: 130.81.242.195
     parents: gw-HP-ftc
@@ -160,6 +160,10 @@ servers:
     address: 193.191.17.50
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-anu:
+    address: 150.203.164.38
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -169,15 +173,11 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client
   raff:
     address: 192.25.206.59
     parents: spohr
     hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs
-  gluck:
-    address: 192.25.206.10
-    parents: spohr
-    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, hasvarfs, hasusrfs
   merkel:
     address: 192.25.206.16
     parents: spohr
@@ -188,7 +188,7 @@ servers:
     hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim
+    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, heavy-exim, bind9-hosts
   spohr2:
     address: 192.25.206.38
     parents: spohr
@@ -196,12 +196,12 @@ servers:
   peri:
     address: 192.25.206.15
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny, single-cpu
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -227,8 +227,8 @@ servers:
   #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
   #  contacts: bzed
   sperger:
-    address: 82.195.75.98
-    parents: gw-man-da
+    address: 82.195.75.34
+    parents: gw-man-da2
     hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
   agricola:
@@ -267,6 +267,14 @@ servers:
     address: 82.195.75.106
     parents: unger
     hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
+  kaufmann:
+    address: 82.195.75.107
+    parents: unger
+    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts
+  byrd:
+    address: 82.195.75.101
+    parents: unger
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs
 
   master:
     address: 70.103.162.29
@@ -277,6 +285,7 @@ servers:
     parents: gw-brainfood
     hostgroups: computers, general, dl380, acpid-hosts, lenny, buildd, hasbootfs, hassrvfs
 
+
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
@@ -302,6 +311,10 @@ servers:
     address: 140.211.166.44
     parents: rietz
     hostgroups: secondary-IPs
+  zee:
+    address: 140.211.166.16
+    parents: gw-osuosl
+    hostgroups: computers, porterbox, lenny, hassrvfs, hasbootfs
 
   villa:
     address: 212.211.132.32
@@ -311,6 +324,10 @@ servers:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, hasvarfs, hasusrfs
+  gluck:
+    address: 150.203.164.38
+    parents: gw-anu
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, no-udev, hassrvfs, acpid-hosts
 
   steffani:
     address: 128.31.0.36
@@ -327,7 +344,7 @@ servers:
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts
   carver:
     address: 128.31.0.50
     parents: gw-mit-csail
@@ -352,7 +369,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, acpid-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts
     contacts: bzed
 
   pergolesi:
@@ -378,11 +395,6 @@ servers:
     hostgroups: computers, porterbox, sw-raid, lenny
     contacts: tjrc1
 
-  verdi:
-    address: 192.54.42.193
-    parents: gw-lrz
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, postgres81-hosts, postfix-hosts
-
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
@@ -411,7 +423,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, hassrvfs
+    hostgroups: computers, ulogd-hosts, lenny, hassrvfs, hasbootfs
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -463,11 +475,15 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
     hostgroups: computers, bl460, acpid-hosts, lenny
+  wolkenstein:
+    address: 137.82.84.89
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, hassrvfs
   brahms:
     address: 137.82.84.74
     parents: dijkstra
@@ -483,15 +499,43 @@ servers:
   valente:
     address: 137.82.84.76
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, single-cpu
+    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, nfs-client, hashomefs, hassrvfs
+    hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
+  morricone:
+    address: 137.82.84.81
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hassrvfs, sw-raid
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts
+  cimarosa:
+    address: 137.82.84.80
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client
+  paganini:
+    address: 137.82.84.82
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  respighi:
+    address: 137.82.84.83
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  vivaldi:
+    address: 137.82.84.84
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
+  # MSA 2000 (2012i)
+  giustini:
+    address: 192.168.2.6
+    parents: dijkstra
+    hostgroups: notacomputer
+    # unless we implement runfrom for host alive checks
+    pingable: false
+    check_command: dsa_check_always_ok
 
   lebrun:
     address: 193.198.184.10
@@ -610,6 +654,9 @@ hostgroups:
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
+  aacraid:
+    alias: Hosts with Adaptec AACraid
+    private: 1
   single-cpu:
     alias: Hosts with only one CPU
     private: 1
@@ -655,9 +702,9 @@ hostgroups:
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
-  postgres81-hosts:
-    alias: hosts running postgres81
-    private: 1
+  #postgres81-hosts:
+  #  alias: hosts running postgres81
+  #  private: 1
   postgres83-hosts:
     alias: hosts running postgres83
     private: 1
@@ -778,7 +825,7 @@ services:
   -
     name: disk usage on /
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /"
     hosts: ries, klecker
   -
     name: disk usage on /boot
@@ -794,7 +841,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
+    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -814,7 +861,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: raff, gluck, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -825,11 +872,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
     hostgroups: hashomefs
-  -
-    name: disk usage on /home
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
-    hosts: gluck
   -
     name: disk usage on /mnt/hdc
     servicegroups: diskspace
@@ -855,6 +897,16 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
     hosts: stabile
+  -
+    name: disk usage on /srv/mirrors
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+    hosts: stabile
+  -
+    name: disk usage on /srv/ftp-master.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org"
+    hosts: stabile
 
  ############ All Computers ############
  ####
@@ -870,14 +922,14 @@ services:
     name: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    normal_check_interval: 180
+    normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
     name: backup server config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: bartok
-    normal_check_interval: 180
+    normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
 
@@ -887,19 +939,13 @@ services:
     servicegroups: kernel
     nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
     hostgroups: computers
-    normal_check_interval: 180
+    normal_check_interval: 60
     retry_check_interval: 5
 
  ####
-  -
-    name: process - puppet
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C ruby -a 'ruby /usr/sbin/puppetd -w 5 --factsync'"
-    hostgroups: lenny
-    excludehosts: agnesi
-
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -f /var/lib/puppet/state/state.yaml"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -988,11 +1034,6 @@ services:
     check: dsa_check_ssh_port!2260
     hosts: agnesi
     normal_check_interval:  180
-  -
-    name: "network service - sshd - 443"
-    check: dsa_check_ssh_port!443
-    hosts: gluck
-    normal_check_interval:  180
 
   -
     name: "network service - sshd - version"
@@ -1091,11 +1132,11 @@ services:
   -
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
-    hosts: rietz, verdi
+    hosts: rietz
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
-    hosts: rietz, verdi
+    hosts: rietz
 
  ### MAIL STUFF
  ###
@@ -1104,17 +1145,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, gluck
+    excludehosts: master, rietz, 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, gluck
+    excludehosts: master, rietz, 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, gluck
+    hosts: master, rietz, merkel
  ###
   -
     name: process - clamav - clamd
@@ -1129,11 +1170,6 @@ services:
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: heavy-exim, heavy-postfix
-  -
-    name: process - clamav - getsigs
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C getclamsigs -a 'getclamsigs'"
-    hostgroups: heavy-exim, heavy-postfix
-  #
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
@@ -1144,17 +1180,15 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
-  -
-    name: unwanted process - clamav - getsigs
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C getclamsigs"
-    hostgroups: computers
-    excludehostgroups: heavy-exim, heavy-postfix
- ###
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: heavy-exim
-    excludehosts: rietz, merkel, raff
+    excludehosts: rietz, merkel, raff, powell
+  -
+    name: process - spamd - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
+    hosts: powell
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -1300,19 +1334,6 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
-  -
-    name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:40 -c 0:90 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-    hostgroups: postfix-hosts
-    excludehosts: liszt
-    depends: process - postfix - master
-  -
-    name: process - postfix - smtp
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C smtp -a 'smtp -t unix -u -c'"
-    hostgroups: postfix-hosts
-    excludehosts: liszt
-    depends: process - postfix - master
-
   -
     name: process - postfix - smtpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:150 -c 0:200 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
@@ -1336,7 +1357,6 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi
     depends: process - postfix - master
   -
     name: network service - submission
@@ -1348,11 +1368,6 @@ services:
     check: dsa_check_smtp_port!2025
     hostgroups: incomingmailrelayed2025
     depends: process - exim
-  -
-    name: network service - smtp - port 2025
-    check: dsa_check_smtp_port!2025
-    hosts: verdi
-    depends: process - postfix - master
   -
     name: network service local - smtps cert
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
@@ -1365,7 +1380,7 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
-    normal_check_interval: 120
+    normal_check_interval: 60
   -
     name: setup - ud-ldap freshness
     nrpe: "/usr/lib/nagios/plugins/dsa-check-udldap-freshness"
@@ -1414,6 +1429,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
+    excludehosts: rietz
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1470,10 +1486,10 @@ services:
     hosts: powell
  ###
   -
-    name: RAID - DAC960
+    name: RAID - aacraid
     servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-dac960"
-    hosts: verdi
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
+    hostgroups: aacraid
  ###
   -
     name: RAID - 3ware
@@ -1527,13 +1543,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: gluck, zelenka, ancina, draghi
+    hosts: zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: gluck, zelenka, ancina, draghi
+    excludehosts: zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1606,14 +1622,14 @@ services:
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
-    hosts: raff
+    hosts: kaufmann
     depends: process - apache2 - master
 
   # https on various hosts
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi, liszt, spohr
+    hosts: ries, klecker, draghi, liszt, spohr, widor
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1626,7 +1642,7 @@ services:
     # draghi           db.debian.org
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt, widor
     depends: network service - https
     normal_check_interval: 60
 
@@ -1700,25 +1716,25 @@ services:
     hosts: ries, ravel, klecker
 
  ###
-  -
-    name: process - postresql81 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a '/usr/lib/postgresql/8.1/bin/postmaster -D /var/lib/postgresql/8.1/main -c config_file=/etc/postgresql/8.1/main/postgresql.conf'"
-    hostgroups: postgres81-hosts
-  -
-    name: process - postresql81 - writer
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: writer process'"
-    hostgroups: postgres81-hosts
-    depends: process - postresql81 - master
-  -
-    name: process - postresql81 - buffer
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats buffer process'"
-    hostgroups: postgres81-hosts
-    depends: process - postresql81 - master
-  -
-    name: process - postresql81 - collector
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats collector process'"
-    hostgroups: postgres81-hosts
-    depends: process - postresql81 - master
+  #-
+  #  name: process - postresql81 - master
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a '/usr/lib/postgresql/8.1/bin/postmaster -D /var/lib/postgresql/8.1/main -c config_file=/etc/postgresql/8.1/main/postgresql.conf'"
+  #  hostgroups: postgres81-hosts
+  #-
+  #  name: process - postresql81 - writer
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: writer process'"
+  #  hostgroups: postgres81-hosts
+  #  depends: process - postresql81 - master
+  #-
+  #  name: process - postresql81 - buffer
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats buffer process'"
+  #  hostgroups: postgres81-hosts
+  #  depends: process - postresql81 - master
+  #-
+  #  name: process - postresql81 - collector
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postmaster -a 'postgres: stats collector process'"
+  #  hostgroups: postgres81-hosts
+  #  depends: process - postresql81 - master
  ####
   -
     name: process - postresql83 - master
@@ -1826,14 +1842,14 @@ 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 /home/org/ftp.root/debian"
-    hosts: gluck
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
     hosts: merkel, raff
+  -
+    name: nfs mount ftp archive
+    nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
+    hosts: bellini
 
  ############ MISC OTHER Stuff ############
  #####
@@ -1843,16 +1859,15 @@ services:
     hosts: global
   -
     name: mirror sync - security
-    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
+    check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
   -
-    name: mirror sync - security.eu
-    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
-    hosts: global
-  -
-    name: mirror sync - security.us
-    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    name: mirror sync - packages
+    check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
     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"
@@ -1881,3 +1896,33 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
+  -
+    name: DNS SOA sync - 2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
+    check: "dsa_check_soas!2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
+    hosts: global
+  -
+    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"
+    hosts: global
+ ############
+  -
+    name: ping alive check
+    remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
+    runfrom: dijkstra
+    hosts: giustini
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
+  -
+    name: Overall Unit Status
+    remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
+    runfrom: dijkstra
+    hosts: giustini