X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=nagios-master.cfg;h=5cdbe4f3f7d2de12c30c70cf687132ef7dd9aafa;hb=7d2f3572b9f82403657f90c543835c04a5597628;hp=8cd0a439adb3c806e06ae3d60e67848df09b092c;hpb=254b6e99d278e311818783ec67c644d83763332b;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 8cd0a43..5cdbe4f 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,34 +10,35 @@
 #  - *: 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
-#  - bruckner
-#  - caballero
 #  - casals
 #  - crest
 #  - elara
 #  - europa
-#  - goedel
 #  - kassia
 #  - kullervo
 #  - lebrun
-#  - leisner
 #  - liszt
-#  - mundy
 #  - murphy
 #  - paer
 #  - piatti
 #  - puccini
+#  - spontini
+#  - tartini
+#sarge:
+#  - caballero
+
+# down:
 #  - ravel
 #  - sarti
+#  - goedel
+#  - leisner
 #  - schulz
-#  - spontini
-#  - tartini
-#  - voltaire
 
 ---
 #############################
@@ -108,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
@@ -136,6 +141,10 @@ servers:
     address: 192.25.206.68
     parents: samosa
     hostgroups: computers, buildd, sw-raid
+  mundy:
+    address: 192.25.206.62
+    parents: samosa
+    hostgroups: computers, buildd
 
   bartok:
     address: 82.195.75.91
@@ -218,6 +227,10 @@ servers:
     address: 62.104.23.252
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid
+  bruckner:
+    address: 62.104.23.253
+    parents: gw-freenet
+    hostgroups: computers, porterbox
 
   raptor:
     address: 195.243.109.162
@@ -243,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
 #
@@ -350,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"
@@ -378,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 ############
  ####
@@ -673,9 +695,36 @@ services:
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
     hostgroups: computers
-    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher
+    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher, bruckner
 
 
+ ####
+ ###
+  -
+    name: unwanted process - system-tools-backends
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C system-tools-ba"
+    hostgroups: computers
+  -
+    name: unwanted process - dbus-daemon
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C dbus-daemon"
+    hostgroups: computers
+  -
+    name: unwanted process - gkrellmd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
+    hostgroups: computers
+  -
+    name: unwanted process - portmap
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
+    hostgroups: computers
+  -
+    name: unwanted process - rpc.statd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
+    hostgroups: computers
+  -
+    name: unwanted process - inetd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
+    hostgroups: computers
+
 
  ############ Processes/Services that only run on some computers ############
  ####
@@ -732,6 +781,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
     hosts: samosa, raptor
     hostgroups: rsyncd-hosts
+  -
+    name: unwanted process - xinetd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
+    hostgroups: computers
+    excludehosts: samosa, raptor
+    excludehostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
@@ -825,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
 
  ####
   -