Commit 26b55b3
Overwrite existing CloudWatch config if merging config fails
`append-config` merges config, but fails when there are conflicting parameters:
```
2024/08/07 19:45:32 Under path : /metrics/metrics_collected/mem | Error : Different values are specified for mem
2024/08/07 19:45:32 Under path : /metrics/metrics_collected/disk | Error : Different values are specified for disk
2024/08/07 19:45:32 Under path : /metrics/append_dimensions | Error : Different values are specified for append_dimensions
2024/08/07 19:45:32 Under path : /metrics/metrics_collected/mem | Error : Different values are specified for mem
2024/08/07 19:45:32 Under path : /metrics/metrics_collected/disk | Error : Different values are specified for disk
2024/08/07 19:45:32 Under path : /metrics/append_dimensions | Error : Different values are specified for append_dimensions
```
`fetch-config` overwrites config.
This commit makes the code to try merging the config first. If it fails, overwrite the config.
Signed-off-by: Hanwen <[email protected]>1 parent 27e12b6 commit 26b55b3
File tree
2 files changed
+3
-3
lines changed- cookbooks/aws-parallelcluster-environment
- resources/cloudwatch/partial
- spec/unit/resources
2 files changed
+3
-3
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
175 | 175 | | |
176 | 176 | | |
177 | 177 | | |
178 | | - | |
| 178 | + | |
179 | 179 | | |
180 | 180 | | |
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
258 | | - | |
| 258 | + | |
259 | 259 | | |
260 | 260 | | |
261 | 261 | | |
| |||
313 | 313 | | |
314 | 314 | | |
315 | 315 | | |
316 | | - | |
| 316 | + | |
317 | 317 | | |
318 | 318 | | |
319 | 319 | | |
| |||
0 commit comments