X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=c25da7d1694b6ca421cf3f921454748eeea45b43;hb=007020798d32704df9caad71422f3c33c0a0fb69;hp=74c47873e443d4c841675117da33a95f488649f3;hpb=1bb8df73f3524c391516d20a143731bec665bff6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 74c4787..c25da7d 100644
--- 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
@@ -898,19 +898,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 +918,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
@@ -1036,7 +1036,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-unicamp
   prokofiev:
@@ -1298,9 +1298,6 @@ hostgroups:
   hasorgfs:
     alias: hosts with a /org filesystem
     private: 1
-  hasvarfs:
-    alias: hosts with a /var filesystem
-    private: 1
   hasvarlogfs:
     alias: hosts with a /var/log filesystem
     private: 1
@@ -1414,11 +1411,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hostgroups: hasbootfs
-  -
-    name: disk usage on /var
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hostgroups: hasvarfs
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -2012,7 +2004,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
@@ -2037,6 +2029,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
@@ -2049,7 +2047,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"
@@ -2070,6 +2068,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