X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=a4e83d3399b05587877af220a1e452034a8b3f7e;hb=59a4b83f685dfee01f3f39af9ec0acfd509763a1;hp=5ef9c2a7b5595f9bede5f79c60181a9d8adf2a8f;hpb=f3a16c651835d0f08777fe9a6f477aaef6e68983;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 5ef9c2a..a4e83d3 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -18,11 +18,9 @@
 #  - lebrun: ippl
 
 # down:
-#  - ravel
 #  - sarti
 #  - goedel
 #  - leisner
-#  - schulz
 
 ---
 #############################
@@ -193,7 +191,7 @@ servers:
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, syslog-ng-hosts, postfix-hosts, dl385
+    hostgroups: computers, service, syslog-ng-hosts, postfix-hosts, dl385, bind9-hosts
     contacts: joerg, bzed
   morales:
     address: 82.195.75.97
@@ -220,6 +218,11 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385
     contacts: bzed
+  auber:
+    address: 82.195.75.101
+    parents: gw-man-da
+    hostgroups: computers, buildd, sw-raid
+    contacts: bzed
 
   master:
     address: 70.103.162.29
@@ -268,7 +271,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 +386,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 +579,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, auber
   -
     name: disk usage on /var
     servicegroups: diskspace
@@ -582,7 +589,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
@@ -592,7 +599,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, auber
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -646,7 +653,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
@@ -877,6 +885,10 @@ services:
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: heavy-exim, heavy-postfix
+  -
+    name: process - clamav - getsigs
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C getclamsigs -a 'getclamsigs'"
+    hostgroups: heavy-exim, heavy-postfix
   #
   -
     name: unwanted process - clamav
@@ -888,6 +900,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+  -
+    name: unwanted process - clamav - getsigs
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C getclamsigs"
+    hostgroups: computers
+    excludehostgroups: heavy-exim, heavy-postfix
  ###
   -
     name: process - spamd - master
@@ -1197,6 +1214,7 @@ services:
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    normal_check_interval: 120
     hostgroups: dl385, dl380, dl360
  ###
   -