Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5809 batch alarms remove email subscription #395

Merged
merged 11 commits into from
Oct 18, 2024
Merged

5809 batch alarms remove email subscription #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cad47a5
fix: batch rule names
Wi11Shell Oct 8, 2024
19a5f51
docs: update Terraform docs
github-actions[bot] Oct 8, 2024
60e928b
fix: add name to targets
Wi11Shell Oct 9, 2024
16f992c
docs: update Terraform docs
github-actions[bot] Oct 9, 2024
5b25e3d
fix: more event renaming
Wi11Shell Oct 9, 2024
6265924
fix: used dlq module
Wi11Shell Oct 14, 2024
47e626c
fix: updated queue arn
Wi11Shell Oct 14, 2024
9a3fa23
docs: update Terraform docs
github-actions[bot] Oct 14, 2024
8b20bc0
fix: sqs module version
Wi11Shell Oct 14, 2024
b50f990
fix: remove email subscription and dlq
Wi11Shell Oct 18, 2024
f4c7a0c
docs: update Terraform docs
github-actions[bot] Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion infra/terraform/modules/service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
| <a name="module_records"></a> [records](#module\_records) | terraform-aws-modules/route53/aws//modules/records | ~> 4.0 |
| <a name="module_route53_records"></a> [route53\_records](#module\_route53\_records) | terraform-aws-modules/acm/aws | ~> 5.0 |
| <a name="module_sns_batch_failure"></a> [sns\_batch\_failure](#module\_sns\_batch\_failure) | terraform-aws-modules/sns/aws | ~> 6.1 |
| <a name="module_sqs_deadletter"></a> [sqs\_deadletter](#module\_sqs\_deadletter) | terraform-aws-modules/sqs/aws | ~> 4.2.1 |

## Resources

Expand Down
24 changes: 5 additions & 19 deletions infra/terraform/modules/service/batch.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,8 @@ module "eventbridge_sns" {
targets = {
"vol-app-${var.environment}-batch-failure-event" = [
{
name = "batch-fail-event"
arn = module.sns_batch_failure.topic_arn
dead_letter_arn = module.sqs_deadletter.queue_arn
name = "batch-fail-event"
arn = module.sns_batch_failure.topic_arn
}
]
}
Expand Down Expand Up @@ -233,13 +232,13 @@ module "sns_batch_failure" {
}]
}
}

/*
subscriptions = {
"vol-app-${var.environment}-batch-failure-email" = {
protocol = "email"
endpoint = "[email protected]"
endpoint = ""
}
}
*/

tags = {
"Name" = "vol-app-${var.environment}-aws-sns-batch-failure"
Expand All @@ -248,19 +247,6 @@ module "sns_batch_failure" {

}

module "sqs_deadletter" {
version = "~> 4.2.1"
source = "terraform-aws-modules/sqs/aws"

name = "vol-app-${var.environment}-batch-failure-queue"

create_dlq = true
redrive_policy = {
# default is 5 for this module
maxReceiveCount = 10
}
}

resource "aws_cloudwatch_log_group" "this" {
name = "/aws/batch/vol-app-${var.environment}"
retention_in_days = 1
Expand Down