X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=292a6f8633657de4ecc8074b5662eb6342ac2209;hb=46ac4793b60ecfe9c4d575ba57ba7b2909e339a8;hp=cc8bbdee188e871bb22ec7b036e6347207103b69;hpb=5bd55f5ecdd165e25fd9bea70762768f1f797c6f;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index cc8bbde..292a6f8 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -45,6 +45,10 @@ servers:
     address: 128.30.0.254
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-xs4all:
+    address: 194.109.137.217
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -57,6 +61,10 @@ servers:
     address: 192.25.206.10
     parents: samosa
     hostgroups: computers, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts
+  merkel:
+    address: 192.25.206.16
+    parents: samosa
+    hostgroups: computers, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts
 
   bartok:
     address: 82.195.75.91
@@ -75,7 +83,7 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-osuosl
-    hostgroups: computers, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts
+    hostgroups: computers, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts
 
   rietz:
     address: 140.211.166.43
@@ -100,6 +108,11 @@ servers:
     parents: gw-mit-csail
     hostgroups: computers, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid
 
+  klecker:
+    address: 194.109.137.218
+    parents: gw-xs4all
+    hostgroups: computers, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres81-hosts
+
 #############################
 # host groups
 #
@@ -152,6 +165,9 @@ hostgroups:
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
+  postgres81-hosts:
+    alias: hosts running postgres81
+    private: 1
 
   secondary-IPs:
     alias: secondary IP addresses
@@ -186,19 +202,31 @@ services:
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
-    hosts: bartok, samosa, raff, lobos, villa
+    hosts: bartok, samosa, raff, lobos, villa, gluck
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani
+    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel
+  -
+    name: disk usage on /org/scratch2
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch2"
+    hosts: merkel
+  -
+    name: disk usage on /oldorg
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /oldorg"
+    hosts: merkel
   -
     name: disk usage on /tmp
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff
+    hosts: samosa, raff, gluck
   -
     name: disk usage on /usr
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa
+    hosts: samosa, raff, lobos, villa, gluck
+  -
+    name: disk usage on /home
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
+    hosts: gluck
 
  ############ All Computers ############
  ####
@@ -325,17 +353,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz
+    excludehosts: master, rietz, merkel
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz
+    excludehosts: master, rietz, merkel
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz
+    hosts: master, rietz, merkel
  ###
   -
     name: process - clamav - clamd
@@ -507,7 +535,7 @@ services:
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
-    hosts: sperger, ries, steffani
+    hosts: sperger, ries, steffani, merkel
  ###
   -
     name: process - acpid
@@ -639,21 +667,21 @@ services:
   -
     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'"
-    hosts: ries
+    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'"
-    hosts: ries
+    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'"
-    hosts: ries
+    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'"
-    hosts: ries
+    hostgroups: postgres81-hosts
     depends: process - postresql81 - master
 
  ####