X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=240a477cf67342f951cc56ea1e9055bca8a148cf;hb=80e4a9833c00b52826746d83c23f7be61e5c94cb;hp=7125b24c53c579b852bcba7d5e087dcfbcf2f61b;hpb=22266611e70a8e2360cc1c11ead5e40302ef36d6;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 7125b24..240a477 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,6 +10,8 @@
 #  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
+#  - *: unwanted: process: inetd.  network: auth
+#  - goetz: gmond/gmetad
 #  -
 #  - agnesi
 #  - bruckner
@@ -17,18 +19,13 @@
 #  - casals
 #  - crest
 #  - elara
-#  - escher
 #  - europa
 #  - goedel
-#  - goetz
 #  - kassia
 #  - kullervo
 #  - lebrun
 #  - leisner
 #  - liszt
-#  - malo
-#  - mayer
-#  - mayr
 #  - mundy
 #  - murphy
 #  - paer
@@ -103,6 +100,10 @@ servers:
     address: 193.62.202.18
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-cst:
+    address: 213.188.99.215
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -156,12 +157,24 @@ servers:
 
   ries:
     address: 128.148.34.103
-    parents: gw-osuosl
+    parents: gw-brown.edu
     hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-email
 
+  mayer:
+    address: 140.211.166.78
+    parents: gw-osuosl
+    hostgroups: computers, buildd
+  mayr:
+    address: 140.211.166.58
+    parents: gw-osuosl
+    hostgroups: computers, buildd
+  malo:
+    address: 140.211.166.27
+    parents: gw-osuosl
+    hostgroups: computers, buildd
   rietz:
     address: 140.211.166.43
-    parents: gw-brown.edu
+    parents: gw-osuosl
     hostgroups: computers, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-email
   rietz2:
     address: 140.211.166.44
@@ -211,6 +224,15 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     hostgroups: computers, porterbox, sw-raid
+  goetz:
+    address: 193.62.202.26
+    parents: gw-sanger
+    hostgroups: computers, buildd, sw-raid
+
+  escher:
+    address: 213.188.99.215
+    parents: gw-cst
+    hostgroups: computers, porterbox
 
 #############################
 # host groups
@@ -315,11 +337,11 @@ services:
   -
     name: disk usage on /boot
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
@@ -339,7 +361,7 @@ services:
   -
     name: disk usage on /tmp
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens
+    hosts: samosa, raff, gluck, saens, escher
   -
     name: disk usage on /usr
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
@@ -347,7 +369,7 @@ services:
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: gluck, raptor
+    hosts: gluck, raptor, escher
   -
     name: disk usage on /chroot
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
@@ -642,7 +664,7 @@ 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
+    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher
 
 
 
@@ -688,7 +710,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, merkel, spohr, peri, penalosa, albeniz
+    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher
  ###
   -
     name: process - acpid
@@ -855,3 +877,9 @@ services:
     name: process - iscsid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 1: -u root -C iscsid '/usr/sbin/iscsid'"
     hosts: raptor
+
+ ###
+  -
+    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