Change t[234] instances to c(5a|6g).large (#957)

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>
aws-observability · Nov 21, 2022 · e3b6ee7 · e3b6ee7
1 parent df6d839
commit e3b6ee7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/terraform/canary/amis.tf b/terraform/canary/amis.tf
@@ -3,7 +3,7 @@ variable "ami_family" {
     amazon_linux = {
       login_user               = "ec2-user"
       install_package          = "aws-otel-collector.rpm"
-      instance_type            = "t3.small"
+      instance_type            = "c5a.large"
       otconfig_destination     = "/tmp/ot-default.yml"
       download_command_pattern = "wget %s"
       install_command          = "sudo rpm -Uvh aws-otel-collector.rpm"

diff --git a/terraform/ec2/amis.tf b/terraform/ec2/amis.tf
@@ -18,7 +18,7 @@ variable "ami_family" {
     debian = {
       login_user               = "ubuntu"
       install_package          = "aws-otel-collector.deb"
-      instance_type            = "t2.micro"
+      instance_type            = "c5a.large"
       otconfig_destination     = "/tmp/ot-default.yml"
       download_command_pattern = "wget %s"
       install_command          = "while sudo fuser /var/cache/apt/archives/lock /var/lib/apt/lists/lock /var/lib/dpkg/lock /var/lib/dpkg/lock-frontend; do echo 'Waiting for dpkg lock...' && sleep 1; done; echo 'No dpkg lock and install collector.' && sudo dpkg -i aws-otel-collector.deb"
@@ -32,7 +32,7 @@ variable "ami_family" {
     linux = {
       login_user               = "ec2-user"
       install_package          = "aws-otel-collector.rpm"
-      instance_type            = "t2.micro"
+      instance_type            = "c5a.large"
       otconfig_destination     = "/tmp/ot-default.yml"
       download_command_pattern = "curl %s --output aws-otel-collector.rpm"
       install_command          = "sudo rpm -Uvh aws-otel-collector.rpm"
@@ -46,7 +46,7 @@ variable "ami_family" {
     windows = {
       login_user               = "Administrator"
       install_package          = "aws-otel-collector.msi"
-      instance_type            = "t3.medium"
+      instance_type            = "c5a.large"
       otconfig_destination     = "C:\\ot-default.yml"
       download_command_pattern = "powershell -command \"Invoke-WebRequest -Uri %s -OutFile C:\\aws-otel-collector.msi\""
       install_command          = "msiexec /i C:\\aws-otel-collector.msi"
@@ -111,7 +111,7 @@ EOF
       family             = "debian"
       arch               = "arm64"
       login_user         = "ubuntu"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 sudo snap refresh amazon-ssm-agent
@@ -138,7 +138,7 @@ EOF
       family             = "debian"
       arch               = "arm64"
       login_user         = "ubuntu"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 sudo snap refresh amazon-ssm-agent
@@ -165,7 +165,7 @@ EOF
       family             = "debian"
       arch               = "arm64"
       login_user         = "ubuntu"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 sudo snap refresh amazon-ssm-agent
@@ -199,7 +199,7 @@ EOF
       family             = "debian"
       arch               = "arm64"
       login_user         = "admin"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 cd /tmp
@@ -238,7 +238,7 @@ EOF
       family             = "debian"
       arch               = "arm64"
       login_user         = "admin"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 cd /tmp
@@ -272,7 +272,7 @@ EOF
       family             = "linux"
       arch               = "arm64"
       login_user         = "ec2-user"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 sudo yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_arm64/amazon-ssm-agent.rpm
@@ -323,7 +323,7 @@ EOF
       family             = "linux"
       login_user         = "ec2-user"
       arch               = "arm64"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 cd /tmp
@@ -371,7 +371,7 @@ EOF
       ami_product_code   = []
       family             = "linux"
       arch               = "arm64"
-      instance_type      = "t4g.micro"
+      instance_type      = "c6g.large"
       user_data          = <<EOF
 #! /bin/bash
 sudo yum install -y python3

diff --git a/terraform/ec2/variables.tf b/terraform/ec2/variables.tf
@@ -25,7 +25,7 @@ variable "testing_ami" {
 }
 
 variable "sidecar_instance_type" {
-  default = "t3.medium"
+  default = "c5a.large"
 }
 
 variable "soaking_compose_file" {

diff --git a/terraform/ec2_setup/amis.tf b/terraform/ec2_setup/amis.tf
@@ -23,7 +23,7 @@ variable "ami_family" {
     windows = {
       login_user                         = "Administrator"
       install_package                    = "aws-otel-collector.msi"
-      instance_type                      = "t3.medium"
+      instance_type                      = "c5a.large"
       otconfig_destination               = "C:\\ot-default.yml"
       download_command_pattern           = "powershell -command \"Invoke-WebRequest -Uri %s -OutFile C:\\aws-otel-collector.msi\""
       install_command                    = "msiexec /i C:\\aws-otel-collector.msi"

diff --git a/terraform/ec2_setup/variables.tf b/terraform/ec2_setup/variables.tf
@@ -17,7 +17,7 @@ variable "testing_ami" {
 }
 
 variable "sidecar_instance_type" {
-  default = "t3.medium"
+  default = "c5a.large"
 }
 
 variable "soaking_sample_app_image" {

diff --git a/terraform/ecs/efs.tf b/terraform/ecs/efs.tf
@@ -69,7 +69,7 @@ resource "aws_key_pair" "aws_ssh_key" {
 
 resource "aws_instance" "collector_efs_ec2" {
   ami                         = data.aws_ami.amazonlinux2.id
-  instance_type               = "t2.micro"
+  instance_type               = "c5a.large"
   subnet_id                   = tolist(module.basic_components.aoc_public_subnet_ids)[0]
   vpc_security_group_ids      = [module.basic_components.aoc_security_group_id]
   associate_public_ip_address = true