[8.19] tf: Use AL2023 for benchmarks, larger disk for TBS benchmark (#19687)

Bring 8.19 branch to a state closer to main, for easier backport of #19619 later. Increase disk size for TBS benchmark.

Author: carsonip

testing/benchmark/main.tf

@@ -154,10 +154,10 @@ module "standalone_apm_server" {
   source = "../infra/terraform/modules/standalone_apm_server"
 
   vpc_id              = module.vpc.vpc_id
-  aws_os              = "amzn2-ami-hvm-*-x86_64-ebs"
+  aws_os              = "al2023-ami-2023.*-x86_64"
   apm_instance_type   = var.standalone_apm_server_instance_size
   apm_volume_type     = var.standalone_apm_server_volume_type
-  apm_volume_size     = var.apm_server_tail_sampling ? coalesce(var.standalone_apm_server_volume_size, 60) : var.standalone_apm_server_volume_size
+  apm_volume_size     = var.apm_server_tail_sampling ? coalesce(var.standalone_apm_server_volume_size, 300) : var.standalone_apm_server_volume_size # Much larger disk for TBS setup because of 8.x TBS disk usage
   apm_iops            = var.standalone_apm_server_iops
   apm_server_bin_path = var.apm_server_bin_path
   ea_managed          = false

testing/infra/terraform/modules/standalone_apm_server/main.tf

@@ -7,6 +7,7 @@ locals {
     "amzn2-ami-kernel-5.10"            = "137112412989" # amazon
     "amzn2-ami-hvm-*-x86_64-ebs"       = "137112412989" # amazon
     "al2023-ami-2023"                  = "137112412989" # amazon
+    "al2023-ami-2023.*-x86_64"         = "137112412989" # amazon
     "RHEL-8"                           = "309956199498" # Red Hat
     "RHEL-9"                           = "309956199498" # Red Hat
   }
@@ -18,6 +19,7 @@ locals {
     "amzn2-ami-kernel-5.10"            = "t4g.nano"
     "amzn2-ami-hvm-*-x86_64-ebs"       = "t4g.nano"
     "al2023-ami-2023"                  = "t4g.nano"
+    "al2023-ami-2023.*-x86_64"         = "t3a.micro"
     "RHEL-8"                           = "t4g.micro" # RHEL doesn't support nano instances
     "RHEL-9"                           = "t4g.micro" # RHEL doesn't support nano instances
   }
@@ -29,6 +31,7 @@ locals {
     "amzn2-ami-kernel-5.10"            = "arm64"
     "amzn2-ami-hvm-*-x86_64-ebs"       = "x86_64"
     "al2023-ami-2023"                  = "arm64"
+    "al2023-ami-2023.*-x86_64"         = "x86_64"
     "RHEL-8"                           = "arm64"
     "RHEL-9"                           = "arm64"
   }
@@ -39,6 +42,7 @@ locals {
     "debian-11-arm64"                  = "curl ${data.external.latest_elastic_agent.result.deb_arm} -o elastic-agent.deb && sudo dpkg -i elastic-agent.deb"
     "amzn2-ami-kernel-5.10"            = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
     "al2023-ami-2023"                  = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
+    "al2023-ami-2023.*-x86_64"         = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
     "RHEL-8"                           = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
     "RHEL-9"                           = "curl ${data.external.latest_elastic_agent.result.rpm_arm} -o elastic-agent.rpm && sudo yum -y install elastic-agent.rpm"
   }
@@ -49,6 +53,7 @@ locals {
     "debian-11-arm64"                  = "curl ${data.external.latest_apm_server.result.deb_arm} -o apm-server.deb && sudo dpkg -i apm-server.deb"
     "amzn2-ami-kernel-5.10"            = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
     "al2023-ami-2023"                  = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
+    "al2023-ami-2023.*-x86_64"         = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
     "RHEL-8"                           = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
     "RHEL-9"                           = "curl ${data.external.latest_apm_server.result.rpm_arm} -o apm-server.rpm && sudo yum -y install apm-server.rpm"
   }
@@ -60,6 +65,7 @@ locals {
     "amzn2-ami-kernel-5.10"            = "ec2-user"
     "amzn2-ami-hvm-*-x86_64-ebs"       = "ec2-user"
     "al2023-ami-2023"                  = "ec2-user"
+    "al2023-ami-2023.*-x86_64"         = "ec2-user"
     "RHEL-8"                           = "ec2-user"
     "RHEL-9"                           = "ec2-user"
   }