From 867d9c4d91db1c212656f861204d4023bc34a869 Mon Sep 17 00:00:00 2001 From: Martijn Mol Date: Tue, 23 Jul 2019 15:31:49 +0200 Subject: [PATCH] MARIO-2195 add cloudwatch metric alarm tags --- apps/lambda_function_sqs_no_vpc/cloudwatch.tf | 4 ++++ apps/lambda_function_sqs_vpc/cloudwatch.tf | 4 ++++ apps/sqs_consume_sns/cloudwatch.tf | 6 ++++++ apps/sqs_consume_sns/locals.tf | 12 ++++++++++++ apps/sqs_queue/cloudwatch.tf | 6 ++++++ 5 files changed, 32 insertions(+) create mode 100644 apps/sqs_consume_sns/locals.tf diff --git a/apps/lambda_function_sqs_no_vpc/cloudwatch.tf b/apps/lambda_function_sqs_no_vpc/cloudwatch.tf index 64b720e2..dd95d3b2 100644 --- a/apps/lambda_function_sqs_no_vpc/cloudwatch.tf +++ b/apps/lambda_function_sqs_no_vpc/cloudwatch.tf @@ -32,6 +32,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } @@ -51,6 +52,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { @@ -69,6 +71,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { @@ -87,4 +90,5 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } \ No newline at end of file diff --git a/apps/lambda_function_sqs_vpc/cloudwatch.tf b/apps/lambda_function_sqs_vpc/cloudwatch.tf index 64b720e2..dd95d3b2 100644 --- a/apps/lambda_function_sqs_vpc/cloudwatch.tf +++ b/apps/lambda_function_sqs_vpc/cloudwatch.tf @@ -32,6 +32,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } @@ -51,6 +52,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { @@ -69,6 +71,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { @@ -87,4 +90,5 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } \ No newline at end of file diff --git a/apps/sqs_consume_sns/cloudwatch.tf b/apps/sqs_consume_sns/cloudwatch.tf index adc26b4a..c66b780d 100644 --- a/apps/sqs_consume_sns/cloudwatch.tf +++ b/apps/sqs_consume_sns/cloudwatch.tf @@ -13,6 +13,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_1" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" { @@ -30,6 +31,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" { @@ -47,6 +49,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" { @@ -65,6 +68,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { @@ -83,6 +87,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { @@ -101,5 +106,6 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } diff --git a/apps/sqs_consume_sns/locals.tf b/apps/sqs_consume_sns/locals.tf new file mode 100644 index 00000000..b83771c0 --- /dev/null +++ b/apps/sqs_consume_sns/locals.tf @@ -0,0 +1,12 @@ +locals { + tags = { + Domain = "${var.tags_domain}" + Name = "${var.app_name}" + "Business Unit" = "${var.tags_business_unit}" + "Cost Center" = "${var.tags_cost_center}" + Team = "${var.tags_team}" + Purpose = "${var.tags_purpose}" + Description = "${var.description}" + Environment = "${var.environment}" + } +} \ No newline at end of file diff --git a/apps/sqs_queue/cloudwatch.tf b/apps/sqs_queue/cloudwatch.tf index 3ca18b33..e9599bfb 100644 --- a/apps/sqs_queue/cloudwatch.tf +++ b/apps/sqs_queue/cloudwatch.tf @@ -13,6 +13,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_1" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" { @@ -30,6 +31,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_2" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" { @@ -47,6 +49,7 @@ resource "aws_cloudwatch_metric_alarm" "stale_messages_alarm_3" { dimensions { QueueName = "${aws_sqs_queue.sqs_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" { @@ -65,6 +68,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_1" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { @@ -83,6 +87,7 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_2" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" } resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { @@ -101,5 +106,6 @@ resource "aws_cloudwatch_metric_alarm" "error_messages_alarm_3" { dimensions { QueueName = "${aws_sqs_queue.sqs_error_queue.name}" } + tags = "${local.tags}" }