nfs-server on buxtehude

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 85e72ba..7f92c8c 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -644,7 +644,7 @@ servers:
   mirror-isc:
     address: 149.20.20.7
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula
   # }}}
   # {{{ gw-leaseweb
   lw01:
@@ -731,7 +731,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, wheezy
+    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, jessie
   geo1:
     address: 82.195.75.105
     parents: ganeti3
@@ -796,14 +796,16 @@ servers:
     address: 140.211.15.34
     parents: gw-osuosl
     hostgroups: computers, service, dl360, hassrvfs, jessie, hasvarlogfs, apache2-hosts, no-bacula, apache-https
+
   byrd:
-    address: 140.211.166.20
+    address: 140.211.166.200
     parents: gw-osuosl
     hostgroups: computers, service, dl380, jessie
-  buxtehude:
-    address: 140.211.166.26
+  beach:
+    address: 140.211.166.201
     parents: byrd
-    hostgroups: computers, service, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, jessie, hasvarlogfs, apache-https, spamd
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, rsyncd-hosts, apache-https
+
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
@@ -898,19 +900,19 @@ servers:
   ubc-bl7:
     address: 206.12.19.217
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
   ubc-bl6:
     address: 206.12.19.216
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
   ubc-bl2:
     address: 206.12.19.212
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
   ubc-bl3:
     address: 206.12.19.213
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
   ubc-bl4:
     address: 206.12.19.214
     parents: sw-ubcece-kais
@@ -918,7 +920,7 @@ servers:
   ubc-bl8:
     address: 206.12.19.218
     parents: sw-ubcece-kais
-    hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
+    hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts
   ganeti2:
     address: 206.12.19.23
     parents: sw-ubcece-kais
@@ -1005,10 +1007,6 @@ servers:
     address: 206.12.19.137
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-bacula
-  beach:
-    address: 206.12.19.140
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula, apache-https
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
@@ -1025,6 +1023,10 @@ servers:
     address: 206.12.19.146
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
+  buxtehude:
+    address: 206.12.19.147
+    parents: ganeti2
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, heavy-exim, postgres94-hosts, hasvarlogfs, apache-https, spamd, nfs-server
   # }}}
   # {{{ gw-ugent
   # }}}
@@ -2004,7 +2006,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz
+    excludehosts: schein, rietz, mirror-anu, mirror-isc, mirror-umn
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2029,6 +2031,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 - hpssacli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
+    normal_check_interval: 120
+    hosts: mirror-anu, mirror-isc, mirror-umn
   ###
 #  -
 #    name: HW - edac status
@@ -2041,7 +2049,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
-    excludehosts: villa, lobos, schein, storace
+    excludehosts: villa, lobos, schein, storace, mirror-anu
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@ -2062,6 +2070,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
     normal_check_interval: 120
     hosts: storace
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present --ps-no-redundant --ignore-failed='PS1'"
+    normal_check_interval: 120
+    hosts: mirror-anu
   ###
   -
     name: RAID - 3ware