Skip to content

Commit a5ffa22

Browse files
Make sqs msg age alarms same period; some tf lint
1 parent 00a58df commit a5ffa22

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

infrastructure/terraform/components/api/alarms.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ locals {
1616

1717
sqs_queue_names = {
1818
letter_updates = {
19-
name = module.sqs_letter_updates.sqs_queue_name
19+
name = module.sqs_letter_updates.sqs_queue_name
2020
age_period_seconds = 900
2121
}
2222
letter_status_updates = {
23-
name = module.letter_status_updates_queue.sqs_queue_name
24-
age_period_seconds = 300
23+
name = module.letter_status_updates_queue.sqs_queue_name
24+
age_period_seconds = 900
2525
}
2626
}
2727
}
2828

2929
module "lambda_alarms" {
30-
for_each = local.lambda_alarm_targets
31-
source = "../../modules/alarms/alarms-lambda"
30+
for_each = local.lambda_alarm_targets
31+
source = "../../modules/alarms/alarms-lambda"
3232

3333
alarm_prefix = local.csi
3434
function_name = each.value
@@ -58,14 +58,14 @@ module "ddb_alarms_suppliers" {
5858
}
5959

6060
module "sqs_alarms" {
61-
for_each = local.sqs_queue_names
62-
source = "../../modules/alarms/alarms-sqs"
61+
for_each = local.sqs_queue_names
62+
source = "../../modules/alarms/alarms-sqs"
6363

64-
alarm_prefix = local.csi
65-
queue_name = each.value.name
66-
dlq_queue_name = replace(each.value.name, "-queue", "-dlq")
64+
alarm_prefix = local.csi
65+
queue_name = each.value.name
66+
dlq_queue_name = replace(each.value.name, "-queue", "-dlq")
6767
age_period_seconds = each.value.age_period_seconds
68-
tags = local.default_tags
68+
tags = local.default_tags
6969
}
7070

7171
module "apigw_alarms" {

infrastructure/terraform/modules/alarms/alarms-lambda/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ resource "aws_cloudwatch_log_metric_filter" "error_logs" {
5858
}
5959

6060
resource "aws_cloudwatch_metric_alarm" "error_logs" {
61-
count = var.enable_error_log_metric ? 1 : 0
62-
alarm_name = "${var.alarm_prefix}-lambda-${var.function_name}-error-logs"
63-
alarm_description = "ERROR: Lambda error logs detected"
61+
count = var.enable_error_log_metric ? 1 : 0
62+
alarm_name = "${var.alarm_prefix}-lambda-${var.function_name}-error-logs"
63+
alarm_description = "ERROR: Lambda error logs detected"
6464

6565
namespace = var.error_log_metric_namespace
6666
metric_name = "${var.error_log_metric_name_prefix}${var.function_name}"

infrastructure/terraform/modules/alarms/alarms-sqs/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ resource "aws_cloudwatch_metric_alarm" "age_anomaly" {
3838
}
3939

4040
resource "aws_cloudwatch_metric_alarm" "dlq_depth" {
41-
count = var.dlq_queue_name == null ? 0 : 1
42-
alarm_name = "${var.alarm_prefix}-sqs-${var.dlq_queue_name}-dlq-depth"
43-
alarm_description = "RELIABILITY: SQS DLQ has messages"
41+
count = var.dlq_queue_name == null ? 0 : 1
42+
alarm_name = "${var.alarm_prefix}-sqs-${var.dlq_queue_name}-dlq-depth"
43+
alarm_description = "RELIABILITY: SQS DLQ has messages"
4444

4545
namespace = "AWS/SQS"
4646
metric_name = "ApproximateNumberOfMessagesVisible"

0 commit comments

Comments
 (0)