X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=b1f5209b895ff336b30b3926dc51775dc8217467;hb=c1090f0a9b851dd09fb43b0327fe813f661f626d;hp=e820fe3e9ceb0f5c57473b285268080781ada565;hpb=872e4bf4d0c279f07a151d569845ed550b57a3f9;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index e820fe3..b1f5209 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -331,6 +331,11 @@ servers:
     parents: gw-1und1
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts
     contacts: joerg
+  powell:
+    address: 87.106.64.223
+    parents: gw-1und1
+    hostgroups: computers, service, heavy-exim
+    contacts: joerg
 
   caballero:
     address: 193.201.200.200
@@ -384,11 +389,11 @@ servers:
     hostgroups: computers, general, dl385, apache2-hosts
 
   lebrun:
-    address: 161.53.160.165
+    address: 193.198.184.10
     parents: gw-carnet
     hostgroups: computers, buildd
   schroeder:
-    address: 161.53.160.164
+    address: 193.198.184.11
     parents: gw-carnet
     hostgroups: computers, buildd, sw-raid
 
@@ -585,7 +590,7 @@ services:
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, puccini, lebrun, tartini, morales
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, puccini, lebrun, tartini, morales, powell
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -600,7 +605,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, auber
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, auber, powell
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -610,12 +615,12 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini
+    hosts: samosa, raff, gluck, saens, puccini, merkel, tartini, powell
   -
     name: disk usage on /usr
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo, tartini, morales
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo, tartini, morales, powell
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -664,6 +669,13 @@ services:
     normal_check_interval: 180
     max_check_attempts: 2
     retry_check_interval: 5
+  -
+    name: backup server config
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
+    hosts: bartok
+    normal_check_interval: 180
+    max_check_attempts: 2
+    retry_check_interval: 5
 
  ####
   -
@@ -675,11 +687,16 @@ services:
     retry_check_interval: 5
 
  ####
+  -
+    name: process - samhain
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
+    hostgroups: computers
   -
     name: samhain
     servicegroups: samhain
     nrpe: "/usr/lib/nagios/plugins/dsa-check-samhain"
     hostgroups: computers
+    depends: process - samhain
     normal_check_interval: 240
     retry_check_interval: 5
 
@@ -1132,8 +1149,8 @@ services:
 
 
   -
-    name: setup - debian-admin in etc aliases
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-da-in-aliases"
+    name: setup - dsa config
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
     normal_check_interval: 120
   -
@@ -1231,6 +1248,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360
+ ###
+  -
+    name: RAID - areca
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
+    hosts: powell
  ###
   -
     name: RAID - DAC960
@@ -1346,13 +1369,13 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: samosa
+    hosts: samosa, ries
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
-    hosts: samosa
+    hosts: samosa, ries
     depends: network service - https
     normal_check_interval: 240
  ####
@@ -1390,7 +1413,7 @@ services:
   -
     name: process - debianqueued
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
-    hosts: ries
+    hosts: ries, ravel
 
  ###
   -