X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=nagios-master.cfg;h=240a477cf67342f951cc56ea1e9055bca8a148cf;hb=80e4a9833c00b52826746d83c23f7be61e5c94cb;hp=0a6f600ba4dfcdbdacdf1b57728995a70f62d258;hpb=b38b2a7223d6dbe82761fab2fbf57732705100b1;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 0a6f600..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
@@ -19,15 +21,11 @@
 #  - elara
 #  - europa
 #  - goedel
-#  - goetz
 #  - kassia
 #  - kullervo
 #  - lebrun
 #  - leisner
 #  - liszt
-#  - malo
-#  - mayer
-#  - mayr
 #  - mundy
 #  - murphy
 #  - paer
@@ -159,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
@@ -214,6 +224,10 @@ 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
@@ -323,7 +337,7 @@ services:
   -
     name: disk usage on /boot
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher
+    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"
@@ -863,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