X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=4b391c0d57b2e25f318d537f3186810bd3a32b33;hb=73b488928be5feb91f61db9f2b1efd2a4d2c8ab2;hp=8abf40206b154cc089b0fc1a5924b9c76f37f2b8;hpb=d7eed5b10b9e802aa936647a4abb6d5f8ae50206;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8abf402..4b391c0 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -241,7 +241,7 @@ servers:
   sperger:
     address: 82.195.75.34
     parents: gw-man-da2
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, lenny
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, hasorgfs, sparc, squeeze
     contacts: bzed
   agricola:
     address: 82.195.75.86
@@ -511,7 +511,7 @@ servers:
   spontini:
     address: 206.12.19.14
     parents: gw-ubc
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, lenny, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, squeeze
     contacts: lfilipoz
   ravel:
     address: 206.12.19.5
@@ -644,15 +644,23 @@ servers:
     address: 206.12.19.126
     parents: traetta
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, xinetd-hosts, autofs
+  dukas:
+    address: 206.12.19.128
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
+  tye:
+    address: 206.12.19.129
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
 
   lebrun:
     address: 193.198.184.10
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, lenny
+    hostgroups: computers, buildd, sw-raid, hasorgfs, sparc, squeeze
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, lenny
+    hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze
 
   tartini:
     address: 82.94.249.158
@@ -1791,7 +1799,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd
+    excludehosts: grieg, byrd, abel, alwyn
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1850,6 +1858,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: kassia
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -1862,6 +1871,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:2 --ignore-transfer-speed=1I:1:3 --ignore-transfer-speed=1I:1:4 --ignore-transfer-speed=2I:1:5 --ignore-transfer-speed=2I:1:6"
+    normal_check_interval: 120
+    hosts: kassia
  ###
   -
     name: HW - hpasmcli status