Updated monitoring_plan variable to be a hash instead of an array that now includes an overridable monitoring target

Author: jschoewe

REFERENCE.md

@@ -1344,8 +1344,10 @@ Disable monitoring for targets in multiple services
 vars:
   patching_monitoring_plan: 'patching::monitoring_multiple'
   patching_monitoring_plan_multiple:
-    - 'patching::monitoring_solarwinds'
-    - 'patching::monitoring_prometheus'
+    - plan: 'patching::monitoring_solarwinds'
+      target: 'solarwinds'
+    - plan: 'patching::monitoring_prometheus'
+      target: 'prometheus'
 
 groups:
   - name: solarwinds

plans/monitoring_multiple.pp

@@ -16,8 +16,10 @@
 #   vars:
 #     patching_monitoring_plan: 'patching::monitoring_multiple'
 #     patching_monitoring_plan_multiple:
-#       - 'patching::monitoring_solarwinds'
-#       - 'patching::monitoring_prometheus'
+#       - plan: 'patching::monitoring_solarwinds'
+#         target: 'solarwinds'
+#       - plan: 'patching::monitoring_prometheus'
+#         target: 'prometheus'
 #
 #   groups:
 #     - name: solarwinds
@@ -48,14 +50,22 @@
 plan patching::monitoring_multiple (
   TargetSpec                $targets,
   Enum['enable', 'disable'] $action,
-  Array                     $monitoring_plan = get_targets($targets)[0].vars['patching_monitoring_plan_multiple'],
+  Array[Hash]               $monitoring_plans = get_targets($targets)[0].vars['patching_monitoring_plan_multiple'],
   Boolean                   $noop = false,
 ) {
 
   # Loop over and run each monitoring plan
-  $monitoring_plan.each |String $plan| {
-    run_plan($plan, $targets,
-              action => $action,
-              noop   => $noop)
+  $monitoring_plans.each |Hash $plan_hash| {
+    if $plan_hash['target'] {
+      run_plan($plan_hash['plan'], $targets,
+                action            => $action,
+                monitoring_target => $plan_hash['target'],
+                noop              => $noop)
+    }
+    else {
+      run_plan($plan_hash['plan'], $targets,
+                action => $action,
+                noop   => $noop)
+    }
   }
 }