X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=52c4d9a728aaa5e988feadf9238a802cbf5e213a;hb=6147097b9d66995a5bd27d70c0951b847d73a8e0;hp=f39f3013ddc4b30549c166884031cd051e79aca6;hpb=70807ab5050ff0ad61aadc87e1d1fa02d9879569;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f39f301..52c4d9a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -232,7 +232,7 @@ servers:
   #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
   #  contacts: bzed
   sperger:
-    address: 82.195.75.98
+    address: 82.195.75.34
     parents: gw-man-da2
     hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
@@ -336,7 +336,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
@@ -390,7 +390,8 @@ servers:
   verdi:
     address: 192.54.42.193
     parents: gw-lrz
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, postgres81-hosts, postfix-hosts
+    hostgroups: computers, service, postfix-hosts
+    #hostgroups: computers, service, apache2-hosts, ftpd-hosts, postgres81-hosts, postfix-hosts
 
   voltaire:
     address: 72.66.115.54
@@ -492,7 +493,7 @@ 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
@@ -679,9 +680,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
@@ -920,15 +921,9 @@ services:
     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 300 -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -1723,25 +1718,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
@@ -1876,6 +1871,13 @@ services:
     name: mirror sync - security.us
     check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    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"