From 442bf5ab5e45505d1ab74c1b50046a5e27e4e975 Mon Sep 17 00:00:00 2001 From: nwoodward Date: Fri, 23 Feb 2024 11:42:39 -0600 Subject: [PATCH 1/2] adds Name tag to Mill EC2 instances --- mill/audit-worker.tf | 5 +++++ mill/bit-report-worker.tf | 5 +++++ mill/bit-worker.tf | 5 +++++ mill/high-priority-dup-worker.tf | 5 +++++ mill/low-priority-dup-worker.tf | 5 +++++ mill/sentinel.tf | 5 +++++ mill/storage-stats-worker.tf | 5 +++++ 7 files changed, 35 insertions(+) diff --git a/mill/audit-worker.tf b/mill/audit-worker.tf index 9bda68a..2d7e5ab 100644 --- a/mill/audit-worker.tf +++ b/mill/audit-worker.tf @@ -24,6 +24,11 @@ resource "aws_autoscaling_group" "audit_worker_asg" { vpc_zone_identifier = [data.aws_subnet.duracloud_a.id, data.aws_subnet.duracloud_c.id, data.aws_subnet.duracloud_d.id] max_size = var.audit_worker_max min_size = 1 + tag { + key = "Name" + value = "Audit Worker" + propagate_at_launch = true + } } resource "aws_autoscaling_policy" "audit_worker_scale_up" { diff --git a/mill/bit-report-worker.tf b/mill/bit-report-worker.tf index 977498a..6f73f1b 100644 --- a/mill/bit-report-worker.tf +++ b/mill/bit-report-worker.tf @@ -28,6 +28,11 @@ resource "aws_autoscaling_group" "bit_report_worker_asg" { vpc_zone_identifier = [data.aws_subnet.duracloud_a.id, data.aws_subnet.duracloud_c.id, data.aws_subnet.duracloud_d.id] max_size = 1 min_size = 0 + tag { + key = "Name" + value = "Bit Report Worker" + propagate_at_launch = true + } } resource "aws_autoscaling_policy" "bit_report_worker_scale_up" { diff --git a/mill/bit-worker.tf b/mill/bit-worker.tf index 2087327..4fe1d16 100644 --- a/mill/bit-worker.tf +++ b/mill/bit-worker.tf @@ -24,6 +24,11 @@ resource "aws_autoscaling_group" "bit_worker_asg" { vpc_zone_identifier = [data.aws_subnet.duracloud_a.id, data.aws_subnet.duracloud_c.id, data.aws_subnet.duracloud_d.id] max_size = var.bit_worker_max min_size = 0 + tag { + key = "Name" + value = "Bit Worker" + propagate_at_launch = true + } } resource "aws_autoscaling_policy" "bit_worker_scale_up" { diff --git a/mill/high-priority-dup-worker.tf b/mill/high-priority-dup-worker.tf index 616861a..15c44c0 100644 --- a/mill/high-priority-dup-worker.tf +++ b/mill/high-priority-dup-worker.tf @@ -24,6 +24,11 @@ resource "aws_autoscaling_group" "high_priority_dup_worker_asg" { vpc_zone_identifier = [data.aws_subnet.duracloud_a.id, data.aws_subnet.duracloud_c.id, data.aws_subnet.duracloud_d.id] max_size = var.high_priority_dup_worker_max min_size = 0 + tag { + key = "Name" + value = "High Priority Duplicate Worker" + propagate_at_launch = true + } } resource "aws_autoscaling_policy" "high_priority_dup_worker_scale_up" { diff --git a/mill/low-priority-dup-worker.tf b/mill/low-priority-dup-worker.tf index 57514d7..156b76e 100644 --- a/mill/low-priority-dup-worker.tf +++ b/mill/low-priority-dup-worker.tf @@ -24,6 +24,11 @@ resource "aws_autoscaling_group" "low_priority_dup_worker_asg" { vpc_zone_identifier = [data.aws_subnet.duracloud_a.id, data.aws_subnet.duracloud_c.id, data.aws_subnet.duracloud_d.id] max_size = var.low_priority_dup_worker_max min_size = 0 + tag { + key = "Name" + value = "Low Priority Duplicate Worker" + propagate_at_launch = true + } } resource "aws_autoscaling_policy" "low_priority_dup_worker_scale_up" { diff --git a/mill/sentinel.tf b/mill/sentinel.tf index cbf85d1..0fe0ca0 100644 --- a/mill/sentinel.tf +++ b/mill/sentinel.tf @@ -22,4 +22,9 @@ resource "aws_autoscaling_group" "sentinel_asg" { vpc_zone_identifier = [data.aws_subnet.duracloud_a.id, data.aws_subnet.duracloud_c.id, data.aws_subnet.duracloud_d.id] max_size = 1 min_size = 1 + tag { + key = "Name" + value = "Sentinel" + propagate_at_launch = true + } } diff --git a/mill/storage-stats-worker.tf b/mill/storage-stats-worker.tf index 226fce9..e60cbf2 100644 --- a/mill/storage-stats-worker.tf +++ b/mill/storage-stats-worker.tf @@ -24,6 +24,11 @@ resource "aws_autoscaling_group" "storage_stats_worker_asg" { vpc_zone_identifier = [data.aws_subnet.duracloud_a.id, data.aws_subnet.duracloud_c.id, data.aws_subnet.duracloud_d.id] max_size = 1 min_size = 0 + tag { + key = "Name" + value = "Storage Stats Worker" + propagate_at_launch = true + } } resource "aws_autoscaling_policy" "storage_stats_worker_scale_up" { From 624415d7ca885a7d89a80962dc0fd4ff9742325f Mon Sep 17 00:00:00 2001 From: nwoodward Date: Fri, 23 Feb 2024 11:48:48 -0600 Subject: [PATCH 2/2] use stack name in tags --- mill/audit-worker.tf | 2 +- mill/bit-report-worker.tf | 2 +- mill/bit-worker.tf | 2 +- mill/high-priority-dup-worker.tf | 2 +- mill/low-priority-dup-worker.tf | 2 +- mill/sentinel.tf | 2 +- mill/storage-stats-worker.tf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mill/audit-worker.tf b/mill/audit-worker.tf index 2d7e5ab..58572c8 100644 --- a/mill/audit-worker.tf +++ b/mill/audit-worker.tf @@ -26,7 +26,7 @@ resource "aws_autoscaling_group" "audit_worker_asg" { min_size = 1 tag { key = "Name" - value = "Audit Worker" + value = "${var.stack_name}-audit-worker" propagate_at_launch = true } } diff --git a/mill/bit-report-worker.tf b/mill/bit-report-worker.tf index 6f73f1b..ca7fcd9 100644 --- a/mill/bit-report-worker.tf +++ b/mill/bit-report-worker.tf @@ -30,7 +30,7 @@ resource "aws_autoscaling_group" "bit_report_worker_asg" { min_size = 0 tag { key = "Name" - value = "Bit Report Worker" + value = "${var.stack_name}-bit-report-worker" propagate_at_launch = true } } diff --git a/mill/bit-worker.tf b/mill/bit-worker.tf index 4fe1d16..b47082d 100644 --- a/mill/bit-worker.tf +++ b/mill/bit-worker.tf @@ -26,7 +26,7 @@ resource "aws_autoscaling_group" "bit_worker_asg" { min_size = 0 tag { key = "Name" - value = "Bit Worker" + value = "${var.stack_name}-bit-worker" propagate_at_launch = true } } diff --git a/mill/high-priority-dup-worker.tf b/mill/high-priority-dup-worker.tf index 15c44c0..79a606f 100644 --- a/mill/high-priority-dup-worker.tf +++ b/mill/high-priority-dup-worker.tf @@ -26,7 +26,7 @@ resource "aws_autoscaling_group" "high_priority_dup_worker_asg" { min_size = 0 tag { key = "Name" - value = "High Priority Duplicate Worker" + value = "${var.stack_name}-high-priority-duplicate-worker" propagate_at_launch = true } } diff --git a/mill/low-priority-dup-worker.tf b/mill/low-priority-dup-worker.tf index 156b76e..ad02c2b 100644 --- a/mill/low-priority-dup-worker.tf +++ b/mill/low-priority-dup-worker.tf @@ -26,7 +26,7 @@ resource "aws_autoscaling_group" "low_priority_dup_worker_asg" { min_size = 0 tag { key = "Name" - value = "Low Priority Duplicate Worker" + value = "${var.stack_name}-low-priority-duplicate-worker" propagate_at_launch = true } } diff --git a/mill/sentinel.tf b/mill/sentinel.tf index 0fe0ca0..657e2d7 100644 --- a/mill/sentinel.tf +++ b/mill/sentinel.tf @@ -24,7 +24,7 @@ resource "aws_autoscaling_group" "sentinel_asg" { min_size = 1 tag { key = "Name" - value = "Sentinel" + value = "${var.stack_name}-sentinel" propagate_at_launch = true } } diff --git a/mill/storage-stats-worker.tf b/mill/storage-stats-worker.tf index e60cbf2..4b72d7f 100644 --- a/mill/storage-stats-worker.tf +++ b/mill/storage-stats-worker.tf @@ -26,7 +26,7 @@ resource "aws_autoscaling_group" "storage_stats_worker_asg" { min_size = 0 tag { key = "Name" - value = "Storage Stats Worker" + value = "${var.stack_name}-storage-stats-worker" propagate_at_launch = true } }