X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=bc2772cc327e2f50f487eac87c1efd9d48252d5c;hb=68088daeba2eb65859c9c29418d0fb070c977199;hp=cadb1e55bd85253d81a04f4f0fb31fb9e42155d9;hpb=6c8a11882ba2e70cf33e56c1f89e1e73c7dbd7db;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index cadb1e5..bc2772c 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -77,7 +77,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-sanger:
-    address: 193.62.202.18
+    address: 193.62.202.20
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: tjrc1
@@ -173,7 +173,8 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ynic:
-    address: 144.32.168.65
+    # really janet, because ynic is stupid about firewalling
+    address: 146.97.42.26
     parents: gw-ubc
     hostgroups: routing-infrastructure
 
@@ -282,14 +283,10 @@ servers:
     address: 82.195.75.70
     parents: gw-man-da
     hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
-  purcell:
-    address: 82.195.75.69
-    parents: gw-man-da
-    hostgroups: computers, buildd
   kokkonen:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, service, acpid-hosts
+    hostgroups: computers, service, acpid-hosts, postgres84-hosts
 
   master:
     address: 70.103.162.29
@@ -315,10 +312,10 @@ servers:
     address: 140.211.166.78
     parents: gw-osuosl
     hostgroups: computers, buildd, hasbootfs
-  mayr:
-    address: 140.211.166.58
-    parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
+#  mayr:
+#    address: 140.211.166.58
+#    parents: gw-osuosl
+#    hostgroups: computers, buildd, hasbootfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -510,6 +507,7 @@ servers:
     hostgroups: computers, bl460, acpid-hosts
   tchaikovsky:
     address: 206.12.19.118
+    address6: 2607:f8f0:610:4000:216:36ff:fe40:3809
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
   wolkenstein:
     address: 206.12.19.116
@@ -1708,7 +1706,13 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460, dl585
+    hostgroups: dl385, dl380, dl360, bl460
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    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 - hpasmcli status