X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=8cd0a439adb3c806e06ae3d60e67848df09b092c;hb=254b6e99d278e311818783ec67c644d83763332b;hp=379faf6a1a8eade7e0ef0a85b9b58e1d8ef0df24;hpb=b27c4c8f3c342f8875481d51a7cf93c222839012;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 379faf6..8cd0a43 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,7 +10,9 @@
 #  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
+#  - *: unwanted: process: inetd.  network: auth
 #  - goetz: gmond/gmetad
+#  - verdi: pg upgrade, openvpn
 #  -
 #  - agnesi
 #  - bruckner
@@ -25,9 +27,6 @@
 #  - lebrun
 #  - leisner
 #  - liszt
-#  - malo
-#  - mayer
-#  - mayr
 #  - mundy
 #  - murphy
 #  - paer
@@ -38,7 +37,6 @@
 #  - schulz
 #  - spontini
 #  - tartini
-#  - verdi
 #  - voltaire
 
 ---
@@ -106,6 +104,10 @@ servers:
     address: 213.188.99.215
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-lrz:
+    address: 129.187.0.150
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -159,12 +161,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
@@ -224,6 +238,11 @@ servers:
     parents: gw-cst
     hostgroups: computers, porterbox
 
+  verdi:
+    address: 192.54.42.193
+    parents: gw-lrz
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, postgres81-hosts, postfix-hosts
+
 #############################
 # host groups
 #
@@ -327,7 +346,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, goetz
+    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"
@@ -335,7 +354,7 @@ services:
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi
+    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi, verdi
   -
     name: disk usage on /srv
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
@@ -700,7 +719,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, escher
+    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher, verdi
  ###
   -
     name: process - acpid
@@ -814,7 +833,7 @@ services:
     hostgroups: ftpd-hosts
   -
     name: process - vsftp - instance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:30 -u ftp -C vsftpd -a 'vsftpd: '"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:30 -c 0:50 -u ftp -C vsftpd -a 'vsftpd: '"
     hostgroups: ftpd-hosts
   -
     name: network service - ftp
@@ -867,3 +886,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