Skip to content

fix: Change cloudwatch log group output to include all created log groups #19

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

Merged
merged 8 commits into from
Dec 2, 2024
Merged

fix: Change cloudwatch log group output to include all created log groups #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e06775
Change cloudwatch log group output to include all created log groups
ottramst Oct 9, 2024
5db26d1
Update docs
ottramst Oct 9, 2024
545137f
Merge branch 'master' into change-cloudwatch-log-group-output
ottramst Oct 14, 2024
3b5a713
Merge branch 'master' into change-cloudwatch-log-group-output
ottramst Oct 18, 2024
4d7aabd
Update examples
ottramst Oct 18, 2024
9344dee
Reinstate log group outputs
ottramst Dec 2, 2024
77f0b4b
Reinstate log group outputs
ottramst Dec 2, 2024
598373d
Merge branch 'master' into change-cloudwatch-log-group-output
ottramst Dec 2, 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: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ No modules.
|------|-------------|
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
| <a name="output_cloudwatch_log_groups"></a> [cloudwatch\_log\_groups](#output\_cloudwatch\_log\_groups) | Map of CloudWatch log groups created and their attributes |
| <a name="output_cluster_address"></a> [cluster\_address](#output\_cluster\_address) | (Memcached only) DNS name of the cache cluster without the port appended |
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The ARN of the ElastiCache Cluster |
| <a name="output_cluster_cache_nodes"></a> [cluster\_cache\_nodes](#output\_cluster\_cache\_nodes) | List of node objects including `id`, `address`, `port` and `availability_zone` |
Expand Down
3 changes: 1 addition & 2 deletions examples/memcached-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ No inputs.

| Name | Description |
|------|-------------|
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
| <a name="output_cloudwatch_log_groups"></a> [cloudwatch\_log\_groups](#output\_cloudwatch\_log\_groups) | Map of CloudWatch log groups created and their attributes |
| <a name="output_cluster_address"></a> [cluster\_address](#output\_cluster\_address) | (Memcached only) DNS name of the cache cluster without the port appended |
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The ARN of the ElastiCache Cluster |
| <a name="output_cluster_cache_nodes"></a> [cluster\_cache\_nodes](#output\_cluster\_cache\_nodes) | List of node objects including `id`, `address`, `port` and `availability_zone` |
Expand Down
11 changes: 3 additions & 8 deletions examples/memcached-cluster/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,9 @@ output "global_replication_group_node_groups" {
# CloudWatch Log Group
################################################################################

output "cloudwatch_log_group_name" {
description = "Name of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_name
}

output "cloudwatch_log_group_arn" {
description = "Arn of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_arn
output "cloudwatch_log_groups" {
description = "Map of CloudWatch log groups created and their attributes"
value = module.elasticache.cloudwatch_log_groups
}

################################################################################
Expand Down
3 changes: 1 addition & 2 deletions examples/redis-cluster-mode/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ No inputs.

| Name | Description |
|------|-------------|
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
| <a name="output_cloudwatch_log_groups"></a> [cloudwatch\_log\_groups](#output\_cloudwatch\_log\_groups) | Map of CloudWatch log groups created and their attributes |
| <a name="output_cluster_address"></a> [cluster\_address](#output\_cluster\_address) | (Memcached only) DNS name of the cache cluster without the port appended |
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The ARN of the ElastiCache Cluster |
| <a name="output_cluster_cache_nodes"></a> [cluster\_cache\_nodes](#output\_cluster\_cache\_nodes) | List of node objects including `id`, `address`, `port` and `availability_zone` |
Expand Down
11 changes: 3 additions & 8 deletions examples/redis-cluster-mode/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,9 @@ output "global_replication_group_node_groups" {
# CloudWatch Log Group
################################################################################

output "cloudwatch_log_group_name" {
description = "Name of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_name
}

output "cloudwatch_log_group_arn" {
description = "Arn of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_arn
output "cloudwatch_log_groups" {
description = "Map of CloudWatch log groups created and their attributes"
value = module.elasticache.cloudwatch_log_groups
}

################################################################################
Expand Down
3 changes: 1 addition & 2 deletions examples/redis-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ No inputs.

| Name | Description |
|------|-------------|
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
| <a name="output_cloudwatch_log_groups"></a> [cloudwatch\_log\_groups](#output\_cloudwatch\_log\_groups) | Map of CloudWatch log groups created and their attributes |
| <a name="output_cluster_address"></a> [cluster\_address](#output\_cluster\_address) | (Memcached only) DNS name of the cache cluster without the port appended |
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The ARN of the ElastiCache Cluster |
| <a name="output_cluster_cache_nodes"></a> [cluster\_cache\_nodes](#output\_cluster\_cache\_nodes) | List of node objects including `id`, `address`, `port` and `availability_zone` |
Expand Down
11 changes: 3 additions & 8 deletions examples/redis-cluster/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,9 @@ output "global_replication_group_node_groups" {
# CloudWatch Log Group
################################################################################

output "cloudwatch_log_group_name" {
description = "Name of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_name
}

output "cloudwatch_log_group_arn" {
description = "Arn of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_arn
output "cloudwatch_log_groups" {
description = "Map of CloudWatch log groups created and their attributes"
value = module.elasticache.cloudwatch_log_groups
}

################################################################################
Expand Down
3 changes: 1 addition & 2 deletions examples/redis-global-replication-group/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ No inputs.

| Name | Description |
|------|-------------|
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
| <a name="output_cloudwatch_log_groups"></a> [cloudwatch\_log\_groups](#output\_cloudwatch\_log\_groups) | Map of CloudWatch log groups created and their attributes |
| <a name="output_cluster_address"></a> [cluster\_address](#output\_cluster\_address) | (Memcached only) DNS name of the cache cluster without the port appended |
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The ARN of the ElastiCache Cluster |
| <a name="output_cluster_cache_nodes"></a> [cluster\_cache\_nodes](#output\_cluster\_cache\_nodes) | List of node objects including `id`, `address`, `port` and `availability_zone` |
Expand Down
11 changes: 3 additions & 8 deletions examples/redis-global-replication-group/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,9 @@ output "global_replication_group_node_groups" {
# CloudWatch Log Group
################################################################################

output "cloudwatch_log_group_name" {
description = "Name of cloudwatch log group created"
value = module.elasticache_primary.cloudwatch_log_group_name
}

output "cloudwatch_log_group_arn" {
description = "Arn of cloudwatch log group created"
value = module.elasticache_primary.cloudwatch_log_group_arn
output "cloudwatch_log_groups" {
description = "Map of CloudWatch log groups created and their attributes"
value = module.elasticache_primary.cloudwatch_log_groups
}

################################################################################
Expand Down
3 changes: 1 addition & 2 deletions examples/redis-replication-group-with-cluster-replica/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ No inputs.

| Name | Description |
|------|-------------|
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
| <a name="output_cloudwatch_log_groups"></a> [cloudwatch\_log\_groups](#output\_cloudwatch\_log\_groups) | Map of CloudWatch log groups created and their attributes |
| <a name="output_cluster_address"></a> [cluster\_address](#output\_cluster\_address) | (Memcached only) DNS name of the cache cluster without the port appended |
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The ARN of the ElastiCache Cluster |
| <a name="output_cluster_cache_nodes"></a> [cluster\_cache\_nodes](#output\_cluster\_cache\_nodes) | List of node objects including `id`, `address`, `port` and `availability_zone` |
Expand Down
11 changes: 3 additions & 8 deletions examples/redis-replication-group-with-cluster-replica/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,9 @@ output "global_replication_group_node_groups" {
# CloudWatch Log Group
################################################################################

output "cloudwatch_log_group_name" {
description = "Name of cloudwatch log group created"
value = module.replication_group_with_cluster_replica.cloudwatch_log_group_name
}

output "cloudwatch_log_group_arn" {
description = "Arn of cloudwatch log group created"
value = module.replication_group_with_cluster_replica.cloudwatch_log_group_arn
output "cloudwatch_log_groups" {
description = "Map of CloudWatch log groups created and their attributes"
value = module.replication_group_with_cluster_replica.cloudwatch_log_groups
}

################################################################################
Expand Down
3 changes: 1 addition & 2 deletions examples/redis-replication-group/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ No inputs.

| Name | Description |
|------|-------------|
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
| <a name="output_cloudwatch_log_groups"></a> [cloudwatch\_log\_groups](#output\_cloudwatch\_log\_groups) | Map of CloudWatch log groups created and their attributes |
| <a name="output_cluster_address"></a> [cluster\_address](#output\_cluster\_address) | (Memcached only) DNS name of the cache cluster without the port appended |
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The ARN of the ElastiCache Cluster |
| <a name="output_cluster_cache_nodes"></a> [cluster\_cache\_nodes](#output\_cluster\_cache\_nodes) | List of node objects including `id`, `address`, `port` and `availability_zone` |
Expand Down
11 changes: 3 additions & 8 deletions examples/redis-replication-group/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,9 @@ output "global_replication_group_node_groups" {
# CloudWatch Log Group
################################################################################

output "cloudwatch_log_group_name" {
description = "Name of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_name
}

output "cloudwatch_log_group_arn" {
description = "Arn of cloudwatch log group created"
value = module.elasticache.cloudwatch_log_group_arn
output "cloudwatch_log_groups" {
description = "Map of CloudWatch log groups created and their attributes"
value = module.elasticache.cloudwatch_log_groups
}

################################################################################
Expand Down
7 changes: 7 additions & 0 deletions outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,18 @@ output "global_replication_group_node_groups" {
# CloudWatch Log Group
################################################################################

output "cloudwatch_log_groups" {
description = "Map of CloudWatch log groups created and their attributes"
value = aws_cloudwatch_log_group.this
}

# TODO - remove at next breaking change
output "cloudwatch_log_group_name" {
description = "Name of cloudwatch log group created"
value = try(aws_cloudwatch_log_group.this[0].name, null)
}

# TODO - remove at next breaking change
output "cloudwatch_log_group_arn" {
description = "Arn of cloudwatch log group created"
value = try(aws_cloudwatch_log_group.this[0].arn, null)
Expand Down