X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=4f76917fb3aa7e8e15d0d3894a76a3772c549ada;hb=d13acbf0e901729e5634b484cf15e7fd2f087eb0;hp=5405fc8906c767e55c41bb169f3831886008b413;hpb=3f4ed1df0ab02c30447d026a006e768d7671c6a2;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5405fc8..4f76917 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -270,7 +270,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu
+    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts
 
   master:
     address: 70.103.162.29
@@ -467,7 +467,7 @@ servers:
   ravel:
     address: 137.82.84.66
     parents: gw-ubc
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts
   dijkstra:
     address: 137.82.84.70
     parents: gw-ubc
@@ -491,15 +491,15 @@ servers:
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, nfs-client, hashomefs, hassrvfs
+    hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hashomefs, sw-raid
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -507,6 +507,7 @@ servers:
     hostgroups: notacomputer
     # unless we implement runfrom for host alive checks
     pingable: false
+    check_command: dsa_check_always_ok
 
   lebrun:
     address: 193.198.184.10
@@ -625,6 +626,9 @@ hostgroups:
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
+  aacraid:
+    alias: Hosts with Adaptec AACraid
+    private: 1
   single-cpu:
     alias: Hosts with only one CPU
     private: 1
@@ -1505,6 +1509,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-dac960"
     hosts: verdi
+ ###
+  -
+    name: RAID - aacraid
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
+    hostgroups: aacraid
  ###
   -
     name: RAID - 3ware
@@ -1917,8 +1927,16 @@ services:
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
  ############
+  -
+    name: ping alive check
+    remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
+    runfrom: dijkstra
+    hosts: giustini
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
   -
     name: Overall Unit Status
-    remotecheck: "/usr/lib/nagios/plugins/check_snmp -H giustini-mnt -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
+    remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
     runfrom: dijkstra
     hosts: giustini