From 93385e5d71017841fed4db14220849d3469e6bdd Mon Sep 17 00:00:00 2001
From: Marina Moutama <marina.moutama@polyconseil.fr>
Date: Wed, 28 Aug 2024 17:01:16 +0200
Subject: [PATCH 1/2] add enable_metrics option to autoscaler asg

---
 docker_autoscaler.tf | 1 +
 variables.tf         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docker_autoscaler.tf b/docker_autoscaler.tf
index f6b3bf738..9dad6421e 100644
--- a/docker_autoscaler.tf
+++ b/docker_autoscaler.tf
@@ -177,6 +177,7 @@ resource "aws_autoscaling_group" "autoscaler" {
   health_check_grace_period = var.runner_worker_docker_autoscaler_asg.health_check_grace_period
   health_check_type         = var.runner_worker_docker_autoscaler_asg.health_check_type
   force_delete              = true
+  enabled_metrics           = var.runner_worker_docker_autoscaler_asg.enabled_metrics
 
   dynamic "tag" {
     for_each = local.tags
diff --git a/variables.tf b/variables.tf
index 767c4554c..8df6b2ad4 100644
--- a/variables.tf
+++ b/variables.tf
@@ -670,6 +670,7 @@ variable "runner_worker_docker_autoscaler_asg" {
     subnet_ids = The list of subnet IDs to use for the Runner Worker when the fleet mode is enabled.
     types = The type of instance to use for the Runner Worker. In case of fleet mode, multiple instance types are supported.
     upgrade_strategy = Auto deploy new instances when launch template changes. Can be either 'bluegreen', 'rolling' or 'off'
+    enabled_metrics = List of metrics to collect.
   EOT
   type = object({
     enable_mixed_instances_policy            = optional(bool, false)
@@ -686,6 +687,7 @@ variable "runner_worker_docker_autoscaler_asg" {
     subnet_ids                               = optional(list(string), [])
     types                                    = optional(list(string), ["m5.large"])
     upgrade_strategy                         = optional(string, "rolling")
+    enabled_metrics                          = optional(list(string), [])
     sg_ingresses = optional(list(object({
       description = string
       from_port   = number

From 43f0c94724af46ec53e2643b75c598e56f3f4dd1 Mon Sep 17 00:00:00 2001
From: Marina Moutama <marina.moutama@polyconseil.fr>
Date: Wed, 28 Aug 2024 17:02:15 +0200
Subject: [PATCH 2/2] add multiple subnet for runner manager for type
 autoscaler

---
 main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.tf b/main.tf
index 0a516c482..3c5b09450 100644
--- a/main.tf
+++ b/main.tf
@@ -183,7 +183,7 @@ locals {
 resource "aws_autoscaling_group" "gitlab_runner_instance" {
   # TODO Please explain how `agent_enable_asg_recreation` works
   name                      = var.runner_enable_asg_recreation ? "${aws_launch_template.gitlab_runner_instance.name}-asg" : "${var.environment}-as-group"
-  vpc_zone_identifier       = length(var.runner_worker_docker_machine_instance.subnet_ids) > 0 ? var.runner_worker_docker_machine_instance.subnet_ids : [var.subnet_id]
+  vpc_zone_identifier       = length(var.runner_worker_docker_machine_instance.subnet_ids) > 0 ? var.runner_worker_docker_machine_instance.subnet_ids : length(var.runner_worker_docker_autoscaler_asg.subnet_ids) > 0 ? var.runner_worker_docker_autoscaler_asg.subnet_ids : [var.subnet_id]
   min_size                  = "1"
   max_size                  = "1"
   desired_capacity          = "1"