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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 28889d9..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,10 +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
+  kokkonen:
+    address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, buildd
+    hostgroups: computers, service, acpid-hosts, postgres84-hosts
 
   master:
     address: 70.103.162.29
@@ -311,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
@@ -506,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
@@ -583,6 +585,18 @@ servers:
     address: 206.12.19.15
     parents: tchaikovsky
     hostgroups: computers, buildd
+  rossini:
+    address: 206.12.19.19
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
+  salieri:
+    address: 206.12.19.20
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
+  traetta:
+    address: 206.12.19.21
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -809,6 +823,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  dl585:
+    alias: HP DL385 hosts
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -1672,12 +1689,12 @@ services:
     name: process - cpqarrayd
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
   -
     name: RAID - arrayprobe
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: franck
   -
     name: RAID - arrayprobe
@@ -1690,12 +1707,18 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     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
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: villa, lobos, liszt, senfl, schein, rore
   -
     name: HW - hpasmcli status