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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b3f9743..03d6aee 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -527,7 +527,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
@@ -948,7 +948,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 /
@@ -1264,6 +1264,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
  ###
@@ -1892,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
@@ -1994,19 +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_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!1800:28800"
     hosts: global
     normal_check_interval: 15
     max_check_attempts: 5