X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=e5e3d8a1323a32916f8031e01a04f3a1f8d4abbf;hb=e79f175e593262905898bc493ab71fa1c4cb6788;hp=33d99480a5b2ccd0384a282cc8b8369438e5d56f;hpb=19d058601497b428ff4eb3cd784d8bc0c48a670f;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 33d9948..e5e3d8a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -131,6 +131,11 @@ servers:
     address: 82.94.249.153
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-telegraaf2:
+    address: 217.196.40.15
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
+    contact_groups: +alioth-admins
   gw-helsinki:
     address: 128.214.173.25
     parents: gw-ubc
@@ -191,6 +196,18 @@ servers:
     pingable: false
     check_command: dsa_check_always_ok
 
+  vasks:
+    address: 217.196.43.132
+    parents: gw-telegraaf2
+    hostgroups: computers
+    contact_groups: alioth-admins
+
+  wagner:
+    address: 217.196.43.140
+    parents: gw-telegraaf2
+    hostgroups: computers
+    contact_groups: alioth-admins
+
   samosa:
     address: 192.25.206.57
     parents: gw-HP-ftc
@@ -210,7 +227,7 @@ servers:
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze, unbound-hosts
+    hostgroups: computers, service, dl380, apache2-hosts, nfs-server, spamd, heavy-exim, squeeze
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
@@ -310,7 +327,7 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, unbound-hosts, squeeze
+    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
@@ -406,7 +423,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, unbound-hosts, squeeze
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, service, apache-https, squeeze
     contacts: bzed
 
   pergolesi:
@@ -644,6 +661,14 @@ 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, hassrvfs
+  tye:
+    address: 206.12.19.129
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, nfs-client, autofs, hassrvfs
 
   lebrun:
     address: 193.198.184.10
@@ -1791,7 +1816,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 +1875,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 +1888,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
@@ -2271,15 +2303,14 @@ services:
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C perl -a '/usr/bin/buildd'"
     hosts: fano, fasch, field, finzi
-    contacts: luk, pkern, HE
-
+    contact_groups: buildd
   -
     name: process - buildd
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     excludehosts: fano, fasch, field, finzi
-    contacts: luk, pkern, HE
+    contact_groups: buildd
 
  ###
   #-