X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0ac0f6f645ece1a34e4611b1d18e374458c66273;hb=afc3d426f4abe3d86064993d01eeeec7cf7a2af6;hp=b57d5f01742dcbc51e9d8cff1eb210004c73eef1;hpb=8729aa54065d2b275b906e50d0771a8c64d326d0;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b57d5f0..0ac0f6f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -173,7 +173,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
@@ -201,7 +201,7 @@ servers:
   penalosa:
     address: 192.25.206.68
     parents: spohr
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -244,7 +244,7 @@ servers:
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385, acpid-hosts, lenny
     contacts: bzed
 #  auber:
 #    address: 82.195.75.101
@@ -486,6 +486,10 @@ servers:
     address: 137.82.84.71
     parents: dijkstra
     hostgroups: computers, service, lenny, hasbootfs, rsyslog-hosts, single-cpu
+  duarte:
+    address: 137.82.84.77
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, hassrvfs
 
   lebrun:
     address: 193.198.184.10
@@ -504,7 +508,7 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, postgres83-hosts, lenny, hasbootfs, incomingmailrelayed2025
+    hostgroups: computers, dl385, ulogd-hosts, acpid-hosts, apache2-hosts, lenny, hasbootfs, incomingmailrelayed2025
     contacts: holger
 
   rem:
@@ -839,6 +843,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
     hosts: caballero
+  -
+    name: disk usage on /var/lib/postgresql
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
+    hosts: samosa
 
  ############ All Computers ############
  ####
@@ -1697,11 +1706,11 @@ 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, klecker
-  -
-    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
+    excludehosts: klecker
+  #-
+  #  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 - 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'"
@@ -1725,7 +1734,7 @@ services:
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd-server.conf'"
-    hosts: piatti
+    hosts: samosa
   -
     name: process - stunnel4 - postgres-udd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/postgres-udd.conf'"