From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 16:45:35 +0000 (-0400)
Subject: [project @ peter@palfrader.org-20080405164535-83n7z42iodojqbe0]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7d2f3572b9f82403657f90c543835c04a5597628;hp=4f6b4f479f0367e3df12fa2827f105b8dc9519b0;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080405164535-83n7z42iodojqbe0]
voltaire
---

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 3c31dd0..5cdbe4f 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,13 +10,12 @@
 #  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
-#  - *: unwanted: process: inetd.  network: auth
+#  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
 #  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
 #  -
 #  - agnesi
-#  - caballero
 #  - casals
 #  - crest
 #  - elara
@@ -29,13 +28,14 @@
 #  - paer
 #  - piatti
 #  - puccini
-#  - ravel
-#  - sarti
 #  - spontini
 #  - tartini
-#  - voltaire
+#sarge:
+#  - caballero
 
 # down:
+#  - ravel
+#  - sarti
 #  - goedel
 #  - leisner
 #  - schulz
@@ -109,6 +109,10 @@ servers:
     address: 129.187.0.150
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-frost:
+    address: 130.81.242.195
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -252,6 +256,11 @@ servers:
     parents: gw-lrz
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, postgres81-hosts, postfix-hosts
 
+  voltaire:
+    address: 72.66.115.54
+    parents: gw-frost
+    hostgroups: computers, buildd
+
 #############################
 # host groups
 #
@@ -359,7 +368,7 @@ services:
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
@@ -387,11 +396,15 @@ services:
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: gluck, raptor, escher
+    hosts: gluck, raptor, escher, voltaire
   -
     name: disk usage on /chroot
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
     hosts: raptor
+  -
+    name: disk usage on /mnt/hdc
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
+    hosts: voltaire
 
  ############ All Computers ############
  ####
@@ -867,6 +880,11 @@ services:
     check: check_dns
     hostgroups: bind9-hosts
     depends: process - named
+  -
+    name: unwanted process - named
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named'"
+    hostgroups: computers
+    excludehostgroups: bind9-hosts
 
  ####
   -