X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=c44d6c96f34078c0c90540d8f4823367159c10f9;hb=9c332a3ec233822d55696b624ae02fe7aaf6cfd0;hp=3c31dd0603d0143c16e7edc78a9c449dd8b8c0e2;hpb=4f6b4f479f0367e3df12fa2827f105b8dc9519b0;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 3c31dd0..c44d6c9 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
@@ -26,16 +25,16 @@
 #  - lebrun
 #  - liszt
 #  - murphy
-#  - paer
 #  - piatti
 #  - puccini
-#  - ravel
-#  - sarti
-#  - spontini
 #  - tartini
-#  - voltaire
+#sarge:
+#  - caballero
+#  - spontini
 
 # down:
+#  - ravel
+#  - sarti
 #  - goedel
 #  - leisner
 #  - schulz
@@ -109,6 +108,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
@@ -141,6 +144,10 @@ servers:
     address: 192.25.206.62
     parents: samosa
     hostgroups: computers, buildd
+  paer:
+    address: 192.25.206.11
+    parents: samosa
+    hostgroups: computers, porterbox, bind9-hosts
 
   bartok:
     address: 82.195.75.91
@@ -180,7 +187,7 @@ servers:
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, tftpd-hosts
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -252,6 +259,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
 #
@@ -319,6 +331,9 @@ hostgroups:
   ftpd-hosts:
     alias: hosts running vsftpd
     private: 1
+  tftpd-hosts:
+    alias: hosts running a tftpd (tftpd-hpa as a daemon)
+    private: 1
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
@@ -355,11 +370,11 @@ services:
   -
     name: disk usage on /boot
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer
   -
     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 +402,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 +886,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
 
  ####
   -
@@ -933,4 +957,9 @@ services:
   -
     name: process - tftpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
-    hosts: malo
+    hostgroups: tftpd-hosts
+ ###
+  -
+    name: process - dhcpd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
+    hosts: paer