From 6c262f00c2304023611a17b198efda830f565450 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Mon, 23 Oct 2023 08:55:42 +0100 Subject: [PATCH] test alarms in csr-development env --- .../corporate-staff-rostering/locals_development.tf | 2 +- .../corporate-staff-rostering/locals_preproduction.tf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/terraform/environments/corporate-staff-rostering/locals_development.tf b/terraform/environments/corporate-staff-rostering/locals_development.tf index 27e047db39e..5695adb47c6 100644 --- a/terraform/environments/corporate-staff-rostering/locals_development.tf +++ b/terraform/environments/corporate-staff-rostering/locals_development.tf @@ -39,7 +39,7 @@ locals { user_data_raw = base64encode(file("./templates/test-user-data.yaml")) instance_profile_policies = concat(module.baseline_presets.ec2_instance.config.default.instance_profile_policies, ["CSRWebServerPolicy"]) }) - + cloudwatch_metric_alarms = local.app_ec2_cloudwatch_metric_alarms instance = merge(module.baseline_presets.ec2_instance.instance.default, { vpc_security_group_ids = ["app", "domain", "jumpserver"] instance_type = "t3.medium" diff --git a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf index 815a85e37fa..145943ad54c 100644 --- a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf +++ b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf @@ -246,13 +246,12 @@ locals { baseline_ec2_autoscaling_groups = { pp-web-tst-1 = { config = merge(module.baseline_presets.ec2_instance.config.default, { - ami_name = "hmpps_windows_server_2022_release_2023-*" # Microsoft Windows Server 2019 Base + ami_name = "hmpps_windows_server_2022_release_2023-*" # Microsoft Windows Server 2022 Base ami_owner = "754260907303" ebs_volumes_copy_all_from_ami = false user_data_raw = base64encode(file("./templates/test-user-data.yaml")) instance_profile_policies = concat(module.baseline_presets.ec2_instance.config.default.instance_profile_policies, ["CSRWebServerPolicy"]) }) - cloudwatch_metric_alarms = local.web_ec2_cloudwatch_metric_alarms instance = merge(module.baseline_presets.ec2_instance.instance.default, { vpc_security_group_ids = ["web", "domain", "jumpserver"]