using proper key to auth on ec2

terraform/ec-1-primaries-v8-m7g.large-tls/common.tf

@@ -0,0 +1,12 @@
+
+################################################################################
+# This is the bucket holding this specific setup tfstate
+################################################################################
+terraform {
+  backend "s3" {
+    bucket = "performance-cto-group"
+    region = "us-east-1"
+    key = "ec-1-primaries-v8-r7g.large-tls"
+  }
+}
+

terraform/ec-1-primaries-v8-m7g.large-tls/ec.tf

@@ -0,0 +1,33 @@
+# resource "aws_elasticache_cluster" "ec" {
+#   cluster_id           = "ec-1-primaries-v8-r7g-xlarge"
+#   node_type            = "cache.m7g.xlarge"
+#   port                 = 6379
+#   apply_immediately    = true
+#   parameter_group_name = "default.valkey8"
+#   engine               = "valkey"
+#   num_cache_nodes      = 1
+#   security_group_ids   = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+#   subnet_group_name    = "ec-subnet"
+#   availability_zone    = "us-east-2a"
+# }
+
+resource "aws_elasticache_replication_group" "ec" {
+  automatic_failover_enabled  = false
+  preferred_cache_cluster_azs = ["us-east-2a"]
+  replication_group_id        = "ec-1-primaries-v8-r7g-large-tls"
+  description                 = "xlarge cache"
+  node_type                   = "cache.m7g.large"
+  num_cache_clusters          = 1
+  parameter_group_name        = "default.valkey8"
+  engine                      = "valkey"
+  port                        = 6379
+  security_group_ids          = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+  subnet_group_name           = "ec-subnet"
+  at_rest_encryption_enabled  = false
+  data_tiering_enabled        = false
+  transit_encryption_enabled  = true
+
+
+
+}
+

terraform/ec-1-primaries-v8-m7g.large-tls/output.tf

@@ -0,0 +1,5 @@
+
+output "ec_members" {
+  value = ["${aws_elasticache_replication_group.ec}"]
+}
+

terraform/ec-1-primaries-v8-m7g.large-tls/shared_resources.tf

@@ -0,0 +1,17 @@
+# provider
+provider "aws" {
+  region = var.region
+}
+
+################################################################################
+# This is the shared resources bucket key -- you will need it across environments like security rules,etc...
+# !! do not change this !!
+################################################################################
+data "terraform_remote_state" "shared_resources" {
+  backend = "s3"
+  config = {
+    bucket = "performance-cto-group"
+    key    = "benchmarks/infrastructure/shared_resources.tfstate"
+    region = "us-east-1"
+  }
+}

terraform/ec-1-primaries-v8-m7g.large-tls/variables.tf

@@ -0,0 +1,5 @@
+
+
+variable "region" {
+  default = "us-east-2"
+}

terraform/ec-1-primaries-v8-m7g.large/common.tf

@@ -0,0 +1,12 @@
+
+################################################################################
+# This is the bucket holding this specific setup tfstate
+################################################################################
+terraform {
+  backend "s3" {
+    bucket = "performance-cto-group"
+    region = "us-east-1"
+    key = "ec-1-primaries-v8-r7g.large"
+  }
+}
+

terraform/ec-1-primaries-v8-m7g.large/ec.tf

@@ -0,0 +1,30 @@
+# resource "aws_elasticache_cluster" "ec" {
+#   cluster_id           = "ec-1-primaries-v8-r7g-xlarge"
+#   node_type            = "cache.m7g.xlarge"
+#   port                 = 6379
+#   apply_immediately    = true
+#   parameter_group_name = "default.valkey8"
+#   engine               = "valkey"
+#   num_cache_nodes      = 1
+#   security_group_ids   = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+#   subnet_group_name    = "ec-subnet"
+#   availability_zone    = "us-east-2a"
+# }
+
+resource "aws_elasticache_replication_group" "ec" {
+  automatic_failover_enabled  = false
+  preferred_cache_cluster_azs = ["us-east-2a"]
+  replication_group_id        = "ec-1-primaries-v8-r7g-large"
+  description                 = "xlarge cache"
+  node_type                   = "cache.m7g.large"
+  num_cache_clusters          = 1
+  parameter_group_name        = "default.valkey8"
+  engine                      = "valkey"
+  port                        = 6379
+  security_group_ids          = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+  subnet_group_name           = "ec-subnet"
+  at_rest_encryption_enabled  = false
+  data_tiering_enabled        = false
+}
+
+

terraform/ec-1-primaries-v8-m7g.large/output.tf

@@ -0,0 +1,5 @@
+
+output "ec_members" {
+  value = ["${aws_elasticache_replication_group.ec}"]
+}
+

terraform/ec-1-primaries-v8-m7g.large/shared_resources.tf

@@ -0,0 +1,17 @@
+# provider
+provider "aws" {
+  region = var.region
+}
+
+################################################################################
+# This is the shared resources bucket key -- you will need it across environments like security rules,etc...
+# !! do not change this !!
+################################################################################
+data "terraform_remote_state" "shared_resources" {
+  backend = "s3"
+  config = {
+    bucket = "performance-cto-group"
+    key    = "benchmarks/infrastructure/shared_resources.tfstate"
+    region = "us-east-1"
+  }
+}

terraform/ec-1-primaries-v8-m7g.large/variables.tf

@@ -0,0 +1,5 @@
+
+
+variable "region" {
+  default = "us-east-2"
+}

terraform/ec-1-primaries-v8-m7g.xlarge-tls/common.tf

@@ -0,0 +1,12 @@
+
+################################################################################
+# This is the bucket holding this specific setup tfstate
+################################################################################
+terraform {
+  backend "s3" {
+    bucket = "performance-cto-group"
+    region = "us-east-1"
+    key = "ec-1-primaries-v8-r7g.xlarge-tls"
+  }
+}
+

terraform/ec-1-primaries-v8-m7g.xlarge-tls/ec.tf

@@ -0,0 +1,31 @@
+# resource "aws_elasticache_cluster" "ec" {
+#   cluster_id           = "ec-1-primaries-v8-r7g-xlarge"
+#   node_type            = "cache.m7g.xlarge"
+#   port                 = 6379
+#   apply_immediately    = true
+#   parameter_group_name = "default.valkey8"
+#   engine               = "valkey"
+#   num_cache_nodes      = 1
+#   security_group_ids   = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+#   subnet_group_name    = "ec-subnet"
+#   availability_zone    = "us-east-2a"
+# }
+
+resource "aws_elasticache_replication_group" "ec" {
+  automatic_failover_enabled  = false
+  preferred_cache_cluster_azs = ["us-east-2a"]
+  replication_group_id        = "ec-1-primaries-v8-r7g-xlarge-tls"
+  description                 = "xlarge cache"
+  node_type                   = "cache.m7g.xlarge"
+  num_cache_clusters          = 1
+  parameter_group_name        = "default.valkey8"
+  engine                      = "valkey"
+  port                        = 6379
+  security_group_ids          = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+  subnet_group_name           = "ec-subnet"
+  at_rest_encryption_enabled  = false
+  data_tiering_enabled        = false
+  transit_encryption_enabled  = true
+}
+
+

terraform/ec-1-primaries-v8-m7g.xlarge-tls/output.tf

@@ -0,0 +1,5 @@
+
+output "ec_members" {
+  value = ["${aws_elasticache_replication_group.ec}"]
+}
+

terraform/ec-1-primaries-v8-m7g.xlarge-tls/shared_resources.tf

@@ -0,0 +1,17 @@
+# provider
+provider "aws" {
+  region = var.region
+}
+
+################################################################################
+# This is the shared resources bucket key -- you will need it across environments like security rules,etc...
+# !! do not change this !!
+################################################################################
+data "terraform_remote_state" "shared_resources" {
+  backend = "s3"
+  config = {
+    bucket = "performance-cto-group"
+    key    = "benchmarks/infrastructure/shared_resources.tfstate"
+    region = "us-east-1"
+  }
+}

terraform/ec-1-primaries-v8-m7g.xlarge-tls/variables.tf

@@ -0,0 +1,5 @@
+
+
+variable "region" {
+  default = "us-east-2"
+}

terraform/ec-1-primaries-v8-m7g.xlarge/common.tf

@@ -0,0 +1,12 @@
+
+################################################################################
+# This is the bucket holding this specific setup tfstate
+################################################################################
+terraform {
+  backend "s3" {
+    bucket = "performance-cto-group"
+    region = "us-east-1"
+    key = "ec-1-primaries-v8-r7g.xlarge"
+  }
+}
+

terraform/ec-1-primaries-v8-m7g.xlarge/ec.tf

@@ -0,0 +1,30 @@
+# resource "aws_elasticache_cluster" "ec" {
+#   cluster_id           = "ec-1-primaries-v8-r7g-xlarge"
+#   node_type            = "cache.m7g.xlarge"
+#   port                 = 6379
+#   apply_immediately    = true
+#   parameter_group_name = "default.valkey8"
+#   engine               = "valkey"
+#   num_cache_nodes      = 1
+#   security_group_ids   = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+#   subnet_group_name    = "ec-subnet"
+#   availability_zone    = "us-east-2a"
+# }
+
+resource "aws_elasticache_replication_group" "ec" {
+  automatic_failover_enabled  = false
+  preferred_cache_cluster_azs = ["us-east-2a"]
+  replication_group_id        = "ec-1-primaries-v8-r7g-xlarge"
+  description                 = "xlarge cache"
+  node_type                   = "cache.m7g.xlarge"
+  num_cache_clusters          = 1
+  parameter_group_name        = "default.valkey8"
+  engine                      = "valkey"
+  port                        = 6379
+  security_group_ids          = ["${data.terraform_remote_state.shared_resources.outputs.performance_cto_sg_id}"]
+  subnet_group_name           = "ec-subnet"
+  at_rest_encryption_enabled  = false
+  data_tiering_enabled        = false
+}
+
+

terraform/ec-1-primaries-v8-m7g.xlarge/output.tf

@@ -0,0 +1,5 @@
+
+output "ec_members" {
+  value = ["${aws_elasticache_replication_group.ec}"]
+}
+

terraform/ec-1-primaries-v8-m7g.xlarge/shared_resources.tf

@@ -0,0 +1,17 @@
+# provider
+provider "aws" {
+  region = var.region
+}
+
+################################################################################
+# This is the shared resources bucket key -- you will need it across environments like security rules,etc...
+# !! do not change this !!
+################################################################################
+data "terraform_remote_state" "shared_resources" {
+  backend = "s3"
+  config = {
+    bucket = "performance-cto-group"
+    key    = "benchmarks/infrastructure/shared_resources.tfstate"
+    region = "us-east-1"
+  }
+}

terraform/ec-1-primaries-v8-m7g.xlarge/variables.tf

@@ -0,0 +1,5 @@
+
+
+variable "region" {
+  default = "us-east-2"
+}

terraform/oss-redisearch-m5-spot-instances/variables.tf

@@ -56,23 +56,32 @@ variable "public_key" {
   default     = "~/.ssh/perf-ci.pub"
 }
 
+
 variable "key_name" {
   description = "key name"
-  default     = "perf-ci"
+  default     = "perf-cto-us-east-2"
 }
 
 variable "region" {
   default = "us-east-2"
 }
 
-# (Ubuntu 20.04)
-# ubuntu-bionic-20.04-amd64-server with redis 7.4.0 and memtier 2.1.1
-# https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#ImageDetails:imageId=ami-0cfbc88a79665b192
+# (Ubuntu 22.04, memtier 2.1.4 and redis unstable from March 6th 2025)
+# ubuntu@ip-10-3-0-162:~$ memtier_benchmark --version
+# memtier_benchmark 2.1.4
+# Copyright (C) 2011-2024 Redis Ltd.
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+# There is NO WARRANTY, to the extent permitted by law.
+# ubuntu@ip-10-3-0-162:~$ redis-server --version
+# Redis server v=255.255.255 sha=f364dcca:0 malloc=jemalloc-5.3.0 bits=64 build=502a999850b32fd8
+# https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#ImageDetails:imageId=ami-0cda50c2e20879afb
 variable "instance_ami" {
-  description = "AMI for aws EC2 instance - us-east-2 Ubuntu 20.04 - perf-cto-base-image-ubuntu20.04-redis-7.4.0-tuned-latency"
-  default     = "ami-0cfbc88a79665b192"
+  description = "AMI for aws EC2 instance - us-east-2 Ubuntu 22.04 - perf-base-image-ubuntu22.04-m6i.8xlarge-20250306-0220"
+  default     = "ami-0cda50c2e20879afb"
 }
 
+
 variable "instance_device_name" {
   description = "EC2 instance device name"
   default     = "/dev/sda1"

terraform/oss-standalone-redisearch-m5-spot-instances/variables.tf

@@ -53,20 +53,29 @@ variable "private_key" {
 
 variable "key_name" {
   description = "key name"
-  default     = "perf-ci"
+  default     = "perf-cto-us-east-2"
 }
 
 variable "region" {
   default = "us-east-2"
 }
 
-# (Ubuntu 20.04)
-# ubuntu-bionic-20.04-amd64-server
+# (Ubuntu 22.04, memtier 2.1.4 and redis unstable from March 6th 2025)
+# ubuntu@ip-10-3-0-162:~$ memtier_benchmark --version
+# memtier_benchmark 2.1.4
+# Copyright (C) 2011-2024 Redis Ltd.
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
+# There is NO WARRANTY, to the extent permitted by law.
+# ubuntu@ip-10-3-0-162:~$ redis-server --version
+# Redis server v=255.255.255 sha=f364dcca:0 malloc=jemalloc-5.3.0 bits=64 build=502a999850b32fd8
+# https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#ImageDetails:imageId=ami-0cda50c2e20879afb
 variable "instance_ami" {
-  description = "AMI for aws EC2 instance - us-east-2 Ubuntu 20.04 - perf-cto-base-image-ubuntu20.04-redis-7.1.241-tuned-latency"
-  default     = "ami-0e64e0b751414b32e"
+  description = "AMI for aws EC2 instance - us-east-2 Ubuntu 22.04 - perf-base-image-ubuntu22.04-m6i.8xlarge-20250306-0220"
+  default     = "ami-0cda50c2e20879afb"
 }
 
+
 variable "instance_device_name" {
   description = "EC2 instance device name"
   default     = "/dev/sda1"