From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 6 Apr 2008 11:40:10 +0000 (-0400)
Subject: [project @ peter@palfrader.org-20080406114010-032gbuitlwifxxj0]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=87ded5a45f8720f8f7bcf555f1577575b0274a5a;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080406114010-032gbuitlwifxxj0]
caballero
---

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 91f86f4..6fbc709 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -28,7 +28,6 @@
 #  - piatti
 #  - tartini
 #sarge:
-#  - caballero
 #  - spontini
 
 # down:
@@ -115,6 +114,10 @@ servers:
     address: 195.20.247.53
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-blackcat:
+    address: 193.201.200.129
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -276,6 +279,11 @@ servers:
     parents: gw-frost
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts
 
+  caballero:
+    address: 193.201.200.200
+    parents: gw-blackcat
+    hostgroups: computers, buildd, bind9-hosts
+
 #############################
 # host groups
 #
@@ -433,6 +441,10 @@ services:
     name: disk usage on /mnt/hdc
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
     hosts: voltaire
+  -
+    name: disk usage on /x
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
+    hosts: voltaire
 
  ############ All Computers ############
  ####
@@ -840,6 +852,11 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
+  -
+    name: unwanted process - snmpd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
+    hostgroups: computers
+    excludehosts: lobos, villa, caballero
 
 
  ############ Processes/Services that only run on some computers ############
@@ -1049,7 +1066,7 @@ services:
   -
     name: process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u snmp -C snmpd -a '/usr/sbin/snmpd -Lsd -Lf /dev/null -u snmp -I -smux -p /var/run/snmpd.pid 127.0.0.1'"
-    hosts: lobos, villa
+    hosts: lobos, villa, caballero
 
  ###
   -