X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=5b4d7d4e3a3b826024ba64b4c29a126e2cf633fd;hb=a2068d0f88f35a6ed34640657baa4d438d44a33b;hp=b790679ee6cef8335e23447f27341c9472de4145;hpb=752c6888c2fc4676eac17c998dac3e4880833db6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b790679..5b4d7d4 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,10 +98,6 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
-  gw-xandros:
-    address: 67.210.160.81
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -181,18 +177,18 @@ servers:
   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
+    hostgroups: computers, no-udev, general, dl380, lenny, hassrvfs, rsyncd-hosts, acpid-hosts, apache2-hosts, ftpd-hosts
   merkel:
     address: 192.25.206.16
     parents: spohr
-    hostgroups: computers, general, apache1-hosts, apache2-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
+    hostgroups: computers, general, apache2-hosts, rsyncd-hosts, sw-raid, postgres83-hosts, heavy-exim, nfs-client, ulogd-hosts, lenny
   merkel2:
     address: 192.25.206.71
     parents: merkel
     hostgroups: secondary-IPs
   spohr:
     address: 192.25.206.33
-    hostgroups: computers, service, dl380, apache2-hosts, postgres83-hosts, ulogd-hosts, nfs-server, lenny, 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
@@ -205,7 +201,7 @@ servers:
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -214,7 +210,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: spohr
-    hostgroups: computers, porterbox, lenny, hasbootfs
+    hostgroups: computers, porterbox, lenny, hasbootfs, hashomefs, single-cpu
   merulo:
     address: 192.25.206.58
     parents: spohr
@@ -258,19 +254,23 @@ servers:
   unger:
     address: 82.195.75.102
     parents: gw-man-da
-    hostgroups: computers, service, dl360, rsyslog-hosts, acpid-hosts, lenny
+    hostgroups: computers, service, dl360, acpid-hosts, lenny
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, rsyslog-hosts, acpid-hosts, lenny, hasbootfs
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
+    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, bind9-hosts
   draghi:
     address: 82.195.75.106
     parents: unger
     hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, heavy-exim, ulogd-hosts
+  kaufmann:
+    address: 82.195.75.107
+    parents: unger
+    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts
 
   master:
     address: 70.103.162.29
@@ -323,15 +323,19 @@ servers:
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
+    hostgroups: computers, single-cpu, lenny, porterbox
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+  senfl:
+    address: 128.31.0.51
+    parents: gw-mit-csail
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
   carver:
     address: 128.31.0.50
     parents: gw-mit-csail
-    hostgroups: computers, service, rsyslog-hosts, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
+    hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
@@ -352,7 +356,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, rsyslog-hosts, acpid-hosts
+    hostgroups: computers, apache2-hosts, sw-raid, single-cpu, lenny, acpid-hosts
     contacts: bzed
 
   pergolesi:
@@ -386,13 +390,13 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, lenny, hasvarfs
+    hostgroups: computers, buildd, lenny, hasvarfs, hashomefs
     contacts: sfrost
 
   puccini:
     address: 87.106.4.56
     parents: gw-1und1
-    hostgroups: computers, buildd, lenny, rsyslog-hosts, ulogd-hosts, hassrvfs
+    hostgroups: computers, buildd, lenny, ulogd-hosts, hassrvfs
     contacts: joerg
   powell:
     address: 87.106.64.223
@@ -411,26 +415,17 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, ulogd-hosts, lenny, rsyslog-hosts, hassrvfs
+    hostgroups: computers, ulogd-hosts, lenny, hassrvfs
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
 
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
     hostgroups: computers, no-udev, buildd, sw-raid, lenny
 
-  elara:
-    address: 67.210.160.90
-    parents: gw-xandros
-    hostgroups: deadslow
-  europa:
-    address: 67.210.160.89
-    parents: gw-xandros
-    hostgroups: deadslow
-
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
@@ -453,11 +448,6 @@ servers:
     parents: kassia
     hostgroups: secondary-IPs
 
-  allegri:
-    address: 157.193.39.233
-    parents: gw-ghent
-    hostgroups: computers, buildd, sw-raid, single-cpu, lenny, hassrvfs, incomingmailrelayed2025
-    contacts: luk
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
@@ -477,11 +467,11 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny
+    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, rsyslog-hosts, acpid-hosts, lenny
+    hostgroups: computers, bl460, acpid-hosts, lenny
   brahms:
     address: 137.82.84.74
     parents: dijkstra
@@ -489,16 +479,40 @@ servers:
   geo2:
     address: 137.82.84.71
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
   duarte:
     address: 137.82.84.77
     parents: dijkstra
     hostgroups: computers, lenny, hasbootfs, hassrvfs
+  valente:
+    address: 137.82.84.76
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, single-cpu
+  bellini:
+    address: 137.82.84.79
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
+  stabile:
+    address: 137.82.84.72
+    parents: gw-ubc
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts
+  cimarosa:
+    address: 137.82.84.80
+    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
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, lenny, rsyslog-hosts
+    hostgroups: computers, buildd, sw-raid, lenny
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
@@ -518,12 +532,12 @@ servers:
   rem:
     address: 195.71.99.217
     parents: gw-telefonica
-    hostgroups: computers, buildd, hasbootfs, lenny
+    hostgroups: computers, buildd, hasbootfs, lenny, hashomefs
 
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
 
   zelenka:
     address: 80.245.147.40
@@ -533,7 +547,7 @@ servers:
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny, hasvarfs, hashomefs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
@@ -542,12 +556,12 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, dl360, bind9-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, dl360, bind9-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, rsyslog-hosts, lenny
+    hostgroups: computers, buildd, lenny
 
   lafayette:
     address: 147.215.7.160
@@ -612,6 +626,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
@@ -627,9 +644,9 @@ hostgroups:
   #syslog-ng-hosts:
   #  alias: hosts running syslog-ng instead of sysklogd
   #  private: 1
-  rsyslog-hosts:
-    alias: hosts running rsyslogd instead of sysklogd
-    private: 1
+  #rsyslog-hosts:
+  #  alias: hosts running rsyslogd instead of sysklogd
+  #  private: 1
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -642,9 +659,6 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
-  apache1-hosts:
-    alias: hosts running apache1
-    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
@@ -703,6 +717,9 @@ hostgroups:
   hassrvfs:
     alias: hosts with a /srv filesystem
     private: 1
+  hashomefs:
+    alias: hosts with a /home filesystem
+    private: 1
   hasvarfs:
     alias: hosts with a /var filesystem
     private: 1
@@ -816,7 +833,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
@@ -826,12 +843,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: voltaire, rem, ball, paer, escher
-  -
-    name: disk usage on /home
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
-    hosts: gluck
+    hostgroups: hashomefs
   -
     name: disk usage on /mnt/hdc
     servicegroups: diskspace
@@ -852,6 +864,21 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
     hosts: samosa
+  -
+    name: disk usage on /srv/morgue.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/morgue.debian.org"
+    hosts: stabile
+  -
+    name: disk usage on /srv/mirrors
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+    hosts: stabile
+  -
+    name: disk usage on /srv/ftp-master.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/ftp-master.debian.org"
+    hosts: stabile
 
  ############ All Computers ############
  ####
@@ -896,7 +923,7 @@ services:
 
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-puppet"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -980,22 +1007,11 @@ services:
     normal_check_interval:  60
     notification_interval: 1440
 
-  -
-    name: "network service - sshd"
-    check: dsa_check_ssh
-    hostgroups: deadslow
-    excludehosts: agnesi
-    normal_check_interval:  180
   -
     name: "network service - sshd - 2260"
     check: dsa_check_ssh_port!2260
     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"
@@ -1060,12 +1076,12 @@ services:
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: allegri, zelenka, ancina
+    excludehosts: zelenka, ancina
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: allegri, zelenka, ancina
+    hosts: zelenka, ancina
     depends: process - xinetd
 
  ###
@@ -1079,27 +1095,26 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C cron -a /usr/sbin/cron"
     hostgroups: computers
 
- ###
- # -
- #   name: process - syslog-ng
- #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
- #   hostgroups: syslog-ng-hosts
  ###
   -
-    name: process - rsyslogd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
-    hostgroups: rsyslog-hosts
+    name: process - syslog-ng
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
+    hostgroups: lenny
+    excludehosts: agnesi
+ ###
+ # -
+ #   name: process - rsyslogd
+ #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
+ #   hostgroups: rsyslog-hosts
  ###
   -
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
-    hostgroups: computers
-    excludehostgroups: rsyslog-hosts
+    hosts: rietz, verdi
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
-    hostgroups: computers
-    excludehostgroups: rsyslog-hosts
+    hosts: rietz, verdi
 
  ### MAIL STUFF
  ###
@@ -1108,17 +1123,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
@@ -1133,11 +1148,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"
@@ -1148,17 +1158,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'"
@@ -1478,6 +1486,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-dac960"
     hosts: verdi
+ ###
+  -
+    name: RAID - aacraid
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
+    hostgroups: aacraid
  ###
   -
     name: RAID - 3ware
@@ -1531,13 +1545,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: allegri, gluck, zelenka, ancina, draghi
+    hosts: gluck, zelenka, ancina, draghi
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: allegri, gluck, zelenka, ancina, draghi
+    excludehosts: gluck, zelenka, ancina, draghi
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1581,6 +1595,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+
   -
     name: network service - http
     check: check_http
@@ -1594,31 +1609,29 @@ services:
     hosts: kassia-sec, kassia-ftp
 
 
+  # apache1 process on merkel
   -
     name: process - apache - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
+    hosts: merkel
   -
     name: process - apache - worker
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
-    hostgroups: apache1-hosts
-    depends: process - apache - master
-  -
-    name: network service - http
-    check: check_http
-    hostgroups: apache1-hosts
+    hosts: merkel
     depends: process - apache - master
 
+  # keyserver on raff
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
     hosts: raff
     depends: process - apache2 - master
 
+  # https on various hosts
   -
     name: network service - https
     check: check_https
-    hosts: ries, klecker, draghi
+    hosts: ries, klecker, draghi, liszt, spohr
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1630,7 +1643,8 @@ services:
     # spohr2		nagios.debian.org
     # draghi		db.debian.org
     # merkel2		nm.debian.org
-    hosts: ries, klecker, spohr, spohr2, draghi, merkel2
+    # liszt		lists.debian.org
+    hosts: ries, klecker, spohr, spohr2, draghi, merkel2, liszt
     depends: network service - https
     normal_check_interval: 60
 
@@ -1830,17 +1844,21 @@ 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 ############
  #####
+  -
+    name: mirror sync - bugs
+    check: "dsa_check_mirrorsync!bugs.debian.org!project/trace/bugs-master.debian.org"
+    hosts: global
   -
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
@@ -1853,6 +1871,10 @@ services:
     name: mirror sync - security.us
     check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: DNS SOA sync - security.geo.debian.org
+    check: "dsa_check_soas!security.geo.debian.org"
+    hosts: global
   -
     name: DNS SOA sync - debian.org
     check: "dsa_check_soas_add!draghi.debian.org!debian.org"
@@ -1877,3 +1899,17 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     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