fix skew parameter

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f803cc2..03d6aee 100644 (file)
--- 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
@@ -694,6 +694,10 @@ servers:
     address: 86.59.118.147
     parents: gw-sil
     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
@@ -1722,12 +1726,16 @@ services:
     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: merikanto2
+    depends: merikanto:process - xinetd
 
  ###
   -
@@ -1890,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
@@ -1992,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