diff --git a/CHANGELOG.md b/CHANGELOG.md index 13f462d..936cd9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ project adheres to [Semantic Versioning](http://semver.org/). ##### Added - Ability to configure force_delete for the worker group ASG (by @stefansedich) +- `enabled_metrics` input (by @zanitete) ##### Changed diff --git a/local.tf b/local.tf index 5523d63..753625b 100644 --- a/local.tf +++ b/local.tf @@ -36,6 +36,7 @@ locals { iam_role_id = "${local.default_iam_role_id}" # Use the specified IAM role if set. suspended_processes = "" # A comma delimited string of processes to to suspend. i.e. AZRebalance,HealthCheck,ReplaceUnhealthy target_group_arns = "" # A comma delimited list of ALB target group ARNs to be associated to the ASG + enabled_metrics = "" # A comma delimited list of metrics to be collected i.e. GroupMinSize,GroupMaxSize,GroupDesiredCapacity } workers_group_defaults = "${merge(local.workers_group_defaults_defaults, var.workers_group_defaults)}" @@ -75,6 +76,7 @@ locals { iam_role_id = "${local.default_iam_role_id}" # Use the specified IAM role if set. suspended_processes = "" # A comma delimited string of processes to to suspend. i.e. AZRebalance,HealthCheck,ReplaceUnhealthy target_group_arns = "" # A comma delimited list of ALB target group ARNs to be associated to the ASG + enabled_metrics = "" # A comma delimited list of metrics to be collected i.e. GroupMinSize,GroupMaxSize,GroupDesiredCapacity } workers_group_launch_template_defaults = "${merge(local.workers_group_launch_template_defaults_defaults, var.workers_group_launch_template_defaults)}" diff --git a/workers.tf b/workers.tf index 088e1ff..1835eb2 100644 --- a/workers.tf +++ b/workers.tf @@ -11,6 +11,7 @@ resource "aws_autoscaling_group" "workers" { vpc_zone_identifier = ["${split(",", coalesce(lookup(var.worker_groups[count.index], "subnets", ""), local.workers_group_defaults["subnets"]))}"] protect_from_scale_in = "${lookup(var.worker_groups[count.index], "protect_from_scale_in", local.workers_group_defaults["protect_from_scale_in"])}" suspended_processes = ["${compact(split(",", coalesce(lookup(var.worker_groups[count.index], "suspended_processes", ""), local.workers_group_defaults["suspended_processes"])))}"] + enabled_metrics = ["${compact(split(",", coalesce(lookup(var.worker_groups[count.index], "enabled_metrics", ""), local.workers_group_defaults["enabled_metrics"])))}"] count = "${var.worker_group_count}" tags = ["${concat( diff --git a/workers_launch_template.tf b/workers_launch_template.tf index 12ad83d..17d0fb3 100644 --- a/workers_launch_template.tf +++ b/workers_launch_template.tf @@ -37,6 +37,7 @@ resource "aws_autoscaling_group" "workers_launch_template" { vpc_zone_identifier = ["${split(",", coalesce(lookup(var.worker_groups_launch_template[count.index], "subnets", ""), local.workers_group_launch_template_defaults["subnets"]))}"] protect_from_scale_in = "${lookup(var.worker_groups_launch_template[count.index], "protect_from_scale_in", local.workers_group_launch_template_defaults["protect_from_scale_in"])}" suspended_processes = ["${compact(split(",", coalesce(lookup(var.worker_groups_launch_template[count.index], "suspended_processes", ""), local.workers_group_launch_template_defaults["suspended_processes"])))}"] + enabled_metrics = ["${compact(split(",", coalesce(lookup(var.worker_groups_launch_template[count.index], "enabled_metrics", ""), local.workers_group_launch_template_defaults["enabled_metrics"])))}"] count = "${var.worker_group_launch_template_count}" tags = ["${concat(