X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=8a2b63f3b622899e01104b525d69a50d5163d626;hb=503cec99cb39dfe86e03a5f10d3ee9a5f8eae7dc;hp=fd36983444b9c522bc46d9a5f970a30fce1bb70a;hpb=0d70477b8cd478b4cb1a5b22ebb16ae6f8a41514;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index fd36983..8a2b63f 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -18,11 +18,9 @@
 #  - lebrun: ippl
 
 # down:
-#  - ravel
 #  - sarti
 #  - goedel
 #  - leisner
-#  - schulz
 
 ---
 #############################
@@ -268,7 +266,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-mit-csail
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts
   casals:
     address: 128.31.0.16
     parents: gw-mit-csail
@@ -383,6 +381,10 @@ servers:
     parents: gw-ubc
     hostgroups: computers, buildd
     contacts: lfilipoz
+  ravel:
+    address: 137.82.84.43
+    parents: gw-ubc
+    hostgroups: computers, general, dl385, apache2-hosts
 
   lebrun:
     address: 161.53.160.165
@@ -572,7 +574,7 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer, spontini, tartini, morales
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel
   -
     name: disk usage on /var
     servicegroups: diskspace
@@ -582,7 +584,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -646,7 +648,8 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    normal_check_interval:  360
+    normal_check_interval:  60
+    retry_check_interval: 15
  ####
   -
     name: backup
@@ -1197,6 +1200,7 @@ services:
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    normal_check_interval: 120
     hostgroups: dl385, dl380, dl360
  ###
   -