X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=15b31521ae8e0004ad37d2d46c6ce245244a289b;hb=35d8ab3d5935e3d9178a7e4c26357a7dcddf4e8c;hp=4b248f4a3b4648387278a66d9517d0c0b685a9ed;hpb=cc032c708bcd93901b636300f68217fdf48cf5d9;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4b248f4..15b3152 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -33,7 +33,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-aql:
-    address: 141.170.2.17
+    address: 141.170.2.19
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-bytemark:
@@ -218,7 +218,7 @@ servers:
   mips-aql-06:
     address: 141.170.6.157
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   minkus:
     address: 141.170.6.151
     parents: gw-aql
@@ -230,11 +230,11 @@ servers:
   mipsel-aql-02:
     address: 141.170.6.153
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, hassrvfs, hasbootfs, sw-raid
+    hostgroups: computers, buildd, stretch, hassrvfs, hasbootfs, sw-raid
   mipsel-aql-03:
     address: 141.170.6.158
     parents: gw-aql
-    hostgroups: computers, buildd, jessie, hassrvfs
+    hostgroups: computers, buildd, stretch, hassrvfs
   # }}}
   # {{{ gw-arm
   abel:
@@ -371,7 +371,7 @@ servers:
   binet:
     address: 5.153.231.8
     parents: gw-bytemark
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   bmdb1:
     address: 5.153.231.10
     parents: gw-bytemark
@@ -457,7 +457,7 @@ servers:
   x86-bm-01:
     address: 5.153.231.32
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, jessie, no-bacula, systemd-timesyncd
+    hostgroups: computers, kvmdomains, stretch, no-bacula, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
@@ -466,10 +466,6 @@ servers:
     address: 5.153.231.34
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
-  httpredir-bm-01:
-    address: 5.153.231.35
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, systemd-timesyncd
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
@@ -597,15 +593,11 @@ servers:
   x86-csail-01:
     address: 128.31.0.50
     parents: ganeti-csail
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   x86-csail-02:
     address: 128.31.0.68
     parents: ganeti-csail
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
-  httpredir-csail-01:
-    address: 128.31.0.66
-    parents: ganeti-csail
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, systemd-timesyncd
   soriano:
     address: 128.31.0.67
     parents: ganeti-csail
@@ -659,7 +651,7 @@ servers:
   x86-grnet-01:
     address: 194.177.211.203
     parents: ganeti-grnet
-    hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd
+    hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   gigault:
     address: 194.177.211.204
     parents: ganeti-grnet
@@ -892,11 +884,11 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, jessie, dl380, hpnewraid
+    hostgroups: computers, service, jessie, dl380, hpnewraid, nfs-client, autofs
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-systemd-hosts, hasvarlogfs, multipath-hosts
+    hostgroups: computers, postgres94-hosts, service, apache2-hosts, sw-raid, jessie, rsyncd-systemd-hosts, hasvarlogfs, multipath-hosts, nfs-server
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -998,7 +990,7 @@ servers:
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, jessie, multipath-hosts, hpnewraid
+    hostgroups: computers, bl460, service, jessie, multipath-hosts, hpnewraid
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
@@ -1099,6 +1091,10 @@ servers:
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd
     contacts: holger
+  hier:
+    address: 209.87.16.43
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   # }}}
   # {{{ gw-umn
   #saens:
@@ -1134,7 +1130,7 @@ servers:
   ppc64el-unicamp-01:
     address: 177.220.10.142
     parents: prokofiev
-    hostgroups: computers, hassrvfs, buildd, jessie
+    hostgroups: computers, hassrvfs, buildd, stretch
   plummer:
     address: 177.220.10.143
     parents: prokofiev
@@ -2184,7 +2180,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     check_interval: 120
     hostgroups: dl380, dl360, bl460, bm-bl
-    excludehosts: villa, lobos, storace, mirror-anu, sallinen
+    excludehosts: villa, lobos, storace, mirror-anu, sallinen, ubc-enc2bl01
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@ -2205,6 +2201,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present --ps-no-redundant --ignore-failed='PS1'"
     check_interval: 120
     hosts: mirror-anu
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
+    check_interval: 120
+    hosts: ubc-enc2bl01
   ###
   -
     name: RAID - aacraid