Skip to content

Commit 167ed76

Browse files
committed
ensure monitor does not notify when monitor resolves
1 parent 7ef5d62 commit 167ed76

File tree

3 files changed

+2
-26
lines changed

3 files changed

+2
-26
lines changed

aws/acm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ No modules.
3131
| <a name="input_alert_critical_priority"></a> [alert\_critical\_priority](#input\_alert\_critical\_priority) | Priority for alerts within critical threshold (P1-P5, uses monitor defaults if not specified) | `string` | `null` | no |
3232
| <a name="input_alert_message"></a> [alert\_message](#input\_alert\_message) | Message to prepend to alert notifications | `string` | `"Alert"` | no |
3333
| <a name="input_alert_nodata_priority"></a> [alert\_nodata\_priority](#input\_alert\_nodata\_priority) | Priority for alerts within warning threshold (P1-P5, uses monitor defaults if not specified) | `string` | `null` | no |
34-
| <a name="input_base_tags"></a> [base\_tags](#input\_base\_tags) | Base tags (key:value format) to add to this type of check (combined with `local.tags` and `var.additional_tags`, generally you should not change this) | `list(string)` | <pre>[<br/> "resource:ec2"<br/>]</pre> | no |
34+
| <a name="input_base_tags"></a> [base\_tags](#input\_base\_tags) | Base tags (key:value format) to add to this type of check (combined with `local.tags` and `var.additional_tags`, generally you should not change this) | `list(string)` | <pre>[<br/> "resource:acm"<br/>]</pre> | no |
3535
| <a name="input_certificate_renewal_failure_check_enabled"></a> [certificate\_renewal\_failure\_check\_enabled](#input\_certificate\_renewal\_failure\_check\_enabled) | Whether to enable the certificate renewal failure check | `bool` | `true` | no |
3636
| <a name="input_cost_center"></a> [cost\_center](#input\_cost\_center) | Cost Center of the monitored resource (leave blank to omit tag) | `string` | `null` | no |
3737
| <a name="input_dashboard_link"></a> [dashboard\_link](#input\_dashboard\_link) | Dashboard link to include in message | `string` | `null` | no |

aws/acm/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ variable "additional_tags" {
88
}
99

1010
variable "base_tags" {
11-
default = ["resource:ec2"]
11+
default = ["resource:acm"]
1212
description = "Base tags (key:value format) to add to this type of check (combined with `local.tags` and `var.additional_tags`, generally you should not change this)"
1313
type = list(string)
1414
}

common/common.tf

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ END
340340
${local.alert_context}
341341
**Alert Information**
342342
{{#is_alert}} ${local.notify_on_alert} {{/is_alert}}
343-
{{#is_recovery}} ${local.notify_on_recovery} {{/is_recovery}}
344343
END
345344

346345
event_alert_base_message = <<END
@@ -369,29 +368,6 @@ Environment: {{env.name}}
369368
370369
Please investigate and take necessary actions.
371370
{{/is_alert}}
372-
373-
{{#is_recovery}}
374-
Recovery: Monitor has returned to a normal state.
375-
376-
Current value: {{value}}
377-
Threshold: {{threshold}}
378-
379-
Environment: {{env.name}}
380-
381-
No further action is required.
382-
383-
{{#is_match "env.name" "prod" "prd"}}
384-
{{#is_match "event.tags.datadog_managed" "critical"}}
385-
${local.notify_on_crit}
386-
{{/is_match}}
387-
{{#is_match "event.tags.datadog_managed" "true"}}
388-
${local.notify_on_prod}
389-
{{/is_match}}
390-
{{/is_match}}
391-
{{^is_match "env.name" "prod" "prd"}}
392-
${local.notify_on_nonprod}
393-
{{/is_match}}
394-
{{/is_recovery}}
395371
END
396372

397373
service_group_by = join(",", formatlist("\"%s\"", var.group_by))

0 commit comments

Comments
 (0)