diff --git a/CHANGELOG.md b/CHANGELOG.md index 54e9b15..ae6ecac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,3 +50,7 @@ * v1.1.5 -- 20210712 - flowlogs - change template input name + +* v1.1.6 -- 20210714 + - flowlogs + - add tags to resources diff --git a/common/version.tf b/common/version.tf index 309eeb3..6dda06d 100644 --- a/common/version.tf +++ b/common/version.tf @@ -1,3 +1,3 @@ locals { - _module_version = "1.1.5" + _module_version = "1.1.6" } diff --git a/flowlogs/main.tf b/flowlogs/main.tf index 33752df..3df8f26 100644 --- a/flowlogs/main.tf +++ b/flowlogs/main.tf @@ -67,6 +67,12 @@ resource "aws_flow_log" "flowlog_public" { iam_role_arn = var.flowlog_role_arn traffic_type = "ALL" subnet_id = each.key + + tags = merge( + local.base_tags, + var.tags, + tomap({ "Name" = format("%v:%v-%v", "s3", var.vpc_full_name, "public") }), + ) } # whole VPC @@ -76,6 +82,12 @@ resource "aws_flow_log" "flowlog" { iam_role_arn = var.flowlog_role_arn traffic_type = "ALL" vpc_id = var.vpc_id + + tags = merge( + local.base_tags, + var.tags, + tomap({ "Name" = format("%v:%v", "s3", var.vpc_full_name) }), + ) } #--- @@ -83,6 +95,12 @@ resource "aws_flow_log" "flowlog" { #--- resource "aws_cloudwatch_log_group" "flowlog" { name = format("%v%v", local._prefixes["log-group"], var.vpc_full_name) + + tags = merge( + local.base_tags, + var.tags, + tomap({ "Name" = format("%v-%v:%v", "cloudwatch", "log-group", var.vpc_full_name) }), + ) } resource "aws_flow_log" "flowlog_cloudwatch" { @@ -90,6 +108,12 @@ resource "aws_flow_log" "flowlog_cloudwatch" { iam_role_arn = var.flowlog_role_arn traffic_type = "ALL" vpc_id = var.vpc_id + + tags = merge( + local.base_tags, + var.tags, + tomap({ "Name" = format("%v:%v", "cloudwatch", var.vpc_full_name) }), + ) } resource "aws_kinesis_stream" "flowlog" { @@ -97,6 +121,7 @@ resource "aws_kinesis_stream" "flowlog" { shard_count = 1 retention_period = 48 shard_level_metrics = ["IncomingBytes", "OutgoingBytes", "IncomingRecords", "OutgoingRecords"] + tags = merge( local.base_tags, var.tags,