Skip to content

Commit 7e5aabe

Browse files
committed
Updated version and used new variable for multiple plans
1 parent 690f38f commit 7e5aabe

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44

55
## Development
66

7-
## Release 1.2.1 (2020-12-02)
7+
## Release 1.2.0 (2020-12-02)
88

99
* Added monitoring_prometheus bolt plan and task to optionally create/delete silences
1010
in Prometheus to suppress alerts for the given targets.

REFERENCE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,8 @@ Disable monitoring for targets in multiple services
13421342

13431343
```puppet
13441344
vars:
1345-
patching_monitoring_plan:
1345+
patching_monitoring_plan: 'patching::monitoring_multiple'
1346+
patching_monitoring_plan_multiple:
13461347
- 'patching::monitoring_solarwinds'
13471348
- 'patching::monitoring_prometheus'
13481349

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "encore-patching",
3-
"version": "1.2.1",
3+
"version": "1.2.0",
44
"author": "Encore Technologies",
55
"summary": "Implements OS patching workflows using Bolt tasks and plans.",
66
"license": "Apache-2.0",

plans/monitoring_multiple.pp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#
1515
# @example Remote target definition for $monitoring_target
1616
# vars:
17-
# patching_monitoring_plan:
17+
# patching_monitoring_plan: 'patching::monitoring_multiple'
18+
# patching_monitoring_plan_multiple:
1819
# - 'patching::monitoring_solarwinds'
1920
# - 'patching::monitoring_prometheus'
2021
#
@@ -47,7 +48,7 @@
4748
plan patching::monitoring_multiple (
4849
TargetSpec $targets,
4950
Enum['enable', 'disable'] $action,
50-
Array $monitoring_plan = get_targets($targets)[0].vars['patching_monitoring_plan'],
51+
Array $monitoring_plan = get_targets($targets)[0].vars['patching_monitoring_plan_multiple'],
5152
Boolean $noop = false,
5253
) {
5354

@@ -57,4 +58,4 @@
5758
action => $action,
5859
noop => $noop)
5960
}
60-
}
61+
}

tasks/monitoring_prometheus.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,4 @@ def task(targets: nil,
8585
end
8686
end
8787

88-
#MonitoringPrometheusTask.run if $PROGRAM_NAME == __FILE__
8988
MonitoringPrometheusTask.run if $PROGRAM_NAME == __FILE__

0 commit comments

Comments
 (0)