diff --git a/logs_monitoring.tf b/logs_monitoring.tf index 800dc1a..2281457 100644 --- a/logs_monitoring.tf +++ b/logs_monitoring.tf @@ -10,6 +10,7 @@ resource "aws_cloudformation_stack" "datadog-forwarder" { FunctionName = "${local.stack_prefix}datadog-forwarder" } template_url = "https://datadog-cloudformation-template.s3.amazonaws.com/aws/forwarder/${var.dd_forwarder_template_version}.yaml" + tags = merge(local.default_tags, var.tags) lifecycle { ignore_changes = [ @@ -21,7 +22,7 @@ resource "aws_cloudformation_stack" "datadog-forwarder" { resource "aws_secretsmanager_secret" "datadog_api_key" { name_prefix = "${local.stack_prefix}datadog-api-key" description = "Datadog API Key" - tags = local.default_tags + tags = merge(local.default_tags, var.tags) } resource "aws_secretsmanager_secret_version" "datadog_api_key" { diff --git a/logs_monitoring_elb.tf b/logs_monitoring_elb.tf index 4b3a667..af06621 100644 --- a/logs_monitoring_elb.tf +++ b/logs_monitoring_elb.tf @@ -44,6 +44,8 @@ data "aws_iam_policy_document" "elb_logs" { resource "aws_s3_bucket" "elb_logs" { count = var.create_elb_logs_bucket ? 1 : 0 bucket = local.elb_logs_s3_bucket + tags = merge(local.default_tags, var.tags) + } resource "aws_s3_bucket_policy" "elb_logs" { diff --git a/main.tf b/main.tf index cba1623..0888560 100644 --- a/main.tf +++ b/main.tf @@ -41,7 +41,7 @@ EOF tags = merge(local.default_tags, { description = "This role allows the datadog AWS account to access this account for metrics collection" - }) + }, var.tags) } resource "aws_iam_policy" "datadog-core" { @@ -49,8 +49,8 @@ resource "aws_iam_policy" "datadog-core" { name = "datadog-core-integration" path = "/" description = "This IAM policy allows for core datadog integration permissions" - - policy = <