Update changes from main branch

indexer/lambda.tf

@@ -13,7 +13,7 @@ resource "aws_lambda_function" "main" {
   function_name = "${each.key}_lambda_function"
   role          = aws_iam_role.lambda_services[each.key].arn
   architectures = [lower(var.lambda_cpu_architecture)]
-  timeout       = 120
+  timeout       = 300
 
   environment {
     variables = merge(

indexer/locals.tf

@@ -38,6 +38,10 @@ locals {
       should_deploy_in_rds_subnet : true,
       ecs_environment_variables : flatten(
         [
+          {
+            name : "AWS_REGION",
+            value : var.region,
+          },
           {
             name : "PG_POOL_MAX",
             value : "30"
@@ -51,7 +55,7 @@ locals {
       ),
     },
     "${local.service_names["comlink"]}" : {
-      ecs_desired_count : 5,
+      ecs_desired_count : var.comlink_ecs_desired_count,
       task_definition_memory : 4096,
       task_definition_cpu : 2048,
       is_public_facing : true,
@@ -97,7 +101,7 @@ locals {
       ),
     },
     "${local.service_names["socks"]}" : {
-      ecs_desired_count : 5,
+      ecs_desired_count : var.socks_ecs_desired_count,
       task_definition_memory : 8192,
       task_definition_cpu : 4096,
       is_public_facing : true,
@@ -109,6 +113,10 @@ locals {
       should_deploy_in_rds_subnet : false,
       ecs_environment_variables : flatten(
         [
+          {
+            name : "AWS_REGION",
+            value : var.region,
+          },
           {
             name : "COMLINK_URL",
             value : aws_lb.public.dns_name,
@@ -195,7 +203,7 @@ locals {
       ),
     },
     "${local.service_names["vulcan"]}" : {
-      ecs_desired_count : 5,
+      ecs_desired_count : var.vulcan_ecs_desired_count,
       task_definition_memory : 8192,
       task_definition_cpu : 4096,
       is_public_facing : false,
@@ -207,6 +215,10 @@ locals {
       should_deploy_in_rds_subnet : false,
       ecs_environment_variables : flatten(
         [
+          {
+            name : "AWS_REGION",
+            value : var.region,
+          },
           {
             name : "PG_POOL_MAX",
             value : "2"

indexer/msk.tf

@@ -19,6 +19,8 @@ resource "aws_msk_configuration" "main" {
   message.max.bytes=4194304
   unclean.leader.election.enable=true
   zookeeper.session.timeout.ms=6000
+  replica.selector.class = org.apache.kafka.common.replica.RackAwareReplicaSelector
+  log.retention.hours = 120
   PROPERTIES
 
   lifecycle {
@@ -57,4 +59,3 @@ resource "aws_msk_cluster" "main" {
     revision = aws_msk_configuration.main.latest_revision
   }
 }
-

indexer/rds.tf

@@ -231,6 +231,7 @@ resource "aws_db_instance" "read_replica" {
   # be specified for a replica, and will match the properties on the source db.
   vpc_security_group_ids = [aws_security_group.rds.id]
   parameter_group_name   = aws_db_parameter_group.main.name
+  allocated_storage      = var.rds_read_replica_db_allocated_storage_gb
   publicly_accessible    = false
   # Set to true if any planned changes need to be applied before the next maintenance window.
   apply_immediately                     = false
@@ -257,6 +258,7 @@ resource "aws_db_instance" "read_replica_2" {
   # be specified for a replica, and will match the properties on the source db.
   vpc_security_group_ids = [aws_security_group.rds.id]
   parameter_group_name   = aws_db_parameter_group.main.name
+  allocated_storage      = var.rds_read_replica_db_allocated_storage_gb
   publicly_accessible    = false
   # Set to true if any planned changes need to be applied before the next maintenance window.
   apply_immediately                     = false

indexer/variables.tf

@@ -119,6 +119,13 @@ variable "rds_db_instance_class" {
 variable "rds_db_allocated_storage_gb" {
   type        = number
   description = "Storage allocated to the Postgres RDS DB in GB"
+  default     = 1000
+}
+
+variable "rds_read_replica_db_allocated_storage_gb" {
+  type        = number
+  description = "Storage allocated to the Postgres RDS read replica DBs in GB"
+  default     = 1000
 }
 
 variable "elasticache_redis_num_cache_clusters" {
@@ -577,3 +584,21 @@ variable "create_backup_full_node" {
   type        = bool
   default     = false
 }
+
+variable "vulcan_ecs_desired_count" {
+  type        = number
+  description = "Number of desired vulcan instances."
+  default     = 5
+}
+
+variable "comlink_ecs_desired_count" {
+  type        = number
+  description = "Number of desired comlinnk instances."
+  default     = 5
+}
+
+variable "socks_ecs_desired_count" {
+  type        = number
+  description = "Number of desired socks instances."
+  default     = 5
+}