X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=03d6aee0789522e372ed52e9905986e98236148c;hb=ada1743f07aa8caf19fd4b81c9850788bb907cc6;hp=9c9e68257a66e3cf5448985d6af3e5dc9841f18c;hpb=7b9dedabac0bbbd23250406908c53f283c1a8051;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9c9e682..03d6aee 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -207,7 +207,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, ulogd-hosts
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -1898,6 +1898,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
@@ -2000,26 +2005,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!snapshot.debian.org!project/trace/snapshot-master.debian.org"
+    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