X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=d33d2b69addb8f254fe148cab07bbf2cced29596;hb=df652a60d5487ede7072679cc66a9a8aa17f484d;hp=774ab26f267999d8d5cf4e14003874f1ba36331e;hpb=77000cde7931bf2e01a2e3b92a39363317473560;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 774ab26..d33d2b6 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -257,7 +257,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-exim, acpid-hosts, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres83-hosts, heavy-exim, acpid-hosts, lenny, puppet
 
   mayer:
     address: 140.211.166.78
@@ -292,7 +292,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
@@ -301,7 +301,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres81-hosts, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim
 
   saens:
     address: 128.101.240.212
@@ -338,7 +338,7 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
@@ -415,7 +415,7 @@ servers:
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts
+    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -1617,31 +1617,19 @@ services:
     name: process - postresql83 - 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/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
     hostgroups: postgres83-hosts
-    excludehosts: piatti
+    excludehosts: piatti, klecker
   -
-    name: process - postresql83 - master
+    name: process - postresql83 - master udd
     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/udd -c config_file=/etc/postgresql/8.3/udd/postgresql.conf'"
     hosts: piatti
   -
-    name: process - postresql83 - writer
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: writer process'"
-    hostgroups: postgres83-hosts
-    depends: process - postresql83 - master
+    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: ries, klecker
   -
-    name: process - postresql83 - wal writer
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: wal writer process'"
-    hostgroups: postgres83-hosts
-    depends: process - postresql83 - master
-  -
-    name: process - postresql83 - autovacuum launcher
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: autovacuum launcher process'"
-    hostgroups: postgres83-hosts
-    depends: process - postresql83 - master
-  -
-    name: process - postresql83 - stats collector
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a 'postgres: stats collector process'"
-    hostgroups: postgres83-hosts
-    depends: process - postresql83 - master
+    name: process - postresql83 - dak-dev 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-dev -c config_file=/etc/postgresql/8.3/dak-dev/postgresql.conf'"
+    hosts: ries
  ####
   -
     name: process - mysql - master
@@ -1711,7 +1699,7 @@ services:
   -
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C monit -a '/usr/sbin/monit -d 30 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
-    hosts: steffani, kassia, master
+    hosts: master
  ###
   -
     name: process - smartd