X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=e29d3e1725fb8bfd093b0e372f7cd93e9c7165cd;hb=e0a4820503fc4c8d8ce982814a19fbdaf3451c58;hp=c0c054461603c31fdeddf29520a849058b114cdd;hpb=863d1daf4d5fd90dc67f6371cde606eb811b5d4c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c0c0544..e29d3e1 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -312,12 +312,12 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, postgres84-hosts, unbound-hosts
+    hostgroups: computers, service, dl385, rsyncd-hosts, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres90-hosts
 
   franck:
     address: 128.148.34.3
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, unbound-hosts
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres90-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, squeeze
 
   mayer:
     address: 140.211.166.78
@@ -426,7 +426,7 @@ servers:
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, sparc
+    hostgroups: computers, porterbox, sw-raid, sparc, squeeze
     contacts: tjrc1, dave
 
   voltaire:
@@ -452,11 +452,11 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, postgres84-hosts, apache-https
+    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim, xinetd-hosts, apache-https, postgres90-hosts, squeeze
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -547,7 +547,7 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres84-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service
+    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres90-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
@@ -675,7 +675,7 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze
 
   praetorius:
     address: 130.239.18.121
@@ -1211,6 +1211,21 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
     hostgroups: hasvicepa
+  -
+    name: disk usage on /var/lib/postgresql/9.0/dak
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /var/lib/postgresql/9.0/dak"
+    hosts: franck
+  -
+    name: disk usage on /srv/ftp-master.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
+    hosts: franck
+  -
+    name: disk usage on /srv/pgbackup
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /srv/pgbackup"
+    hosts: franck
 
  ############ All Computers ############
  ####
@@ -2124,14 +2139,14 @@ services:
   #  name: process - postresql83 - dak master
   #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/dak -c config_file=/etc/postgresql/8.3/dak/postgresql.conf'"
   #  hosts: chopin
-  -
-    name: process - postresql84 - dak 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 -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-    hosts: franck, chopin
-  -
-    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: franck
+  #-
+  #  name: process - postresql84 - dak 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 -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
+  #  hosts: franck, chopin
+  #-
+  #  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: franck
  # backups
   -
     name: postgresql backups