put mirror-anu, mirror-isc, mirror-umn into a hpnewraid group

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index a856954..4c455f2 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -522,7 +522,7 @@ servers:
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror, apache-https
   mirror-umn2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -656,7 +656,7 @@ servers:
   mirror-isc:
     address: 149.20.20.7
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
   mirror-isc2:
     address: 149.20.20.19
     parents: mirror-isc
@@ -1058,7 +1058,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
+    hostgroups: computers, service, apache2-hosts, dl360, hpnewraid, hassrvfs, xinetd-hosts, jessie, security_mirror
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
@@ -1198,6 +1198,9 @@ hostgroups:
   general:
     alias: general purpose developer accessible machines
 
+  hpnewraid:
+    alias: new (2015+) machines where we need hpssacli instead of hpacucli
+    private: 1
   dl380:
     alias: HP DL380 hosts
     private: 1
@@ -2033,7 +2036,8 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz, mirror-anu, mirror-isc, mirror-umn
+    excludehosts: schein, rietz
+    excludehostgroups: hpnewraid
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2063,7 +2067,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
     check_interval: 120
-    hosts: mirror-anu, mirror-isc, mirror-umn
+    hostsgroups: hpnewraid
   ###
 #  -
 #    name: HW - edac status