Merge pull request #6212 from ministryofjustice/DPR2-749-2

Disable Kinesis Agent Auto Scale
ministryofjustice · May 23, 2024 · e92f289 · e92f289
2 parents f14c843 + 7189ce9
commit e92f289
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/terraform/environments/digital-prison-reporting/application_variables.json b/terraform/environments/digital-prison-reporting/application_variables.json
@@ -86,6 +86,7 @@
       "create_glue_registries": false,
       "setup_s3_buckets": true,
       "create_glue_connections": false,
+      "kinesis_agent_autoscale": false,
       "ec2_instance_type": "t3.small",
       "ami_image_id": "ami-00cc4c3fee6bb6c22",
       "setup_redshift": true,
@@ -272,6 +273,7 @@
       "create_glue_registries": false,
       "setup_s3_buckets": true,
       "create_glue_connections": false,
+      "kinesis_agent_autoscale": true,      
       "ec2_instance_type": "t3.small",
       "ami_image_id": "ami-00cc4c3fee6bb6c22",
       "setup_redshift": true,
@@ -458,6 +460,7 @@
       "create_glue_registries": false,
       "setup_s3_buckets": true,
       "create_glue_connections": false,
+      "kinesis_agent_autoscale": true,      
       "ec2_instance_type": "t3.small",
       "ami_image_id": "ami-00cc4c3fee6bb6c22",
       "setup_redshift": true,
@@ -646,6 +649,7 @@
       "create_glue_registries": false,
       "setup_s3_buckets": true,
       "create_glue_connections": false,
+      "kinesis_agent_autoscale": true,      
       "ec2_instance_type": "t3.small",
       "ami_image_id": "ami-00cc4c3fee6bb6c22",
       "setup_redshift": true,

diff --git a/terraform/environments/digital-prison-reporting/locals.tf b/terraform/environments/digital-prison-reporting/locals.tf
@@ -5,6 +5,9 @@ locals {
 
   other_log_retention_in_days = local.application_data.accounts[local.environment].other_log_retention_in_days
 
+  # Kinesis Agent
+  kinesis_agent_autoscale = local.application_data.accounts[local.environment].kinesis_agent_autoscale
+
   # glue_db                       = local.application_data.accounts[local.environment].glue_db_name
   # glue_db_data_domain           = local.application_data.accounts[local.environment].glue_db_data_domain
   description             = local.application_data.accounts[local.environment].db_description

diff --git a/terraform/environments/digital-prison-reporting/main.tf b/terraform/environments/digital-prison-reporting/main.tf
@@ -952,11 +952,12 @@ module "ec2_kinesis_agent" {
   aws_region                  = local.account_region
   ec2_terminate_behavior      = "terminate"
   associate_public_ip_address = false
-  static_private_ip           = "10.26.24.201" # Used for Dev as a Secondary IP
+  static_private_ip           = "10.26.24.202" # Used for Dev as a Secondary IP
   ebs_optimized               = true
   monitoring                  = true
   ebs_size                    = 20
   ebs_encrypted               = true
+  scale_down                  = local.kinesis_agent_autoscale
   ebs_delete_on_termination   = false
   # s3_policy_arn               = aws_iam_policy.read_s3_read_access_policy.arn # TBC
   region  = local.account_region