[project @ peter@palfrader.org-20080404100730-hrdanha3wmungrot]

Add merkel

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 5744f36..292a6f8 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -61,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
@@ -202,7 +206,15 @@ services:
   -
     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"
@@ -341,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
@@ -523,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