From cf65e7f0dc75bd04eb274d29cddddffb78c6e320 Mon Sep 17 00:00:00 2001
From: Taylan Erden <tayfuntaylanerden@gmail.com>
Date: Mon, 2 Dec 2024 15:32:54 +0000
Subject: [PATCH 1/4] SRE-2231 adding aws tags into simulator and updating
 VPC,igw related to aws account migration

---
 templates/hazelcast5-cp-ec2/aws/main.tf         | 16 ++++++++++++++++
 templates/hazelcast5-cp-ec2/inventory_plan.yaml | 15 ++++++++++-----
 templates/hazelcast5-ec2/aws/main.tf            | 16 ++++++++++++++++
 templates/hazelcast5-ec2/inventory_plan.yaml    | 11 ++++++++---
 templates/hazelcast5-hd-ec2/aws/main.tf         | 14 ++++++++++++++
 templates/hazelcast5-hd-ec2/inventory_plan.yaml | 11 ++++++++---
 templates/hazelcast5-sql-ec2-tstore/aws/main.tf | 14 ++++++++++++++
 .../inventory_plan.yaml                         |  3 +++
 templates/hazelcast5-sql-ec2/aws/main.tf        | 16 ++++++++++++++++
 .../hazelcast5-sql-ec2/inventory_plan.yaml      | 11 ++++++++---
 .../hazelcast5-sql-prunability-ec2/aws/main.tf  | 14 ++++++++++++++
 .../inventory_plan.yaml                         | 17 ++++++++++-------
 templates/hazelcast5-storage-ec2/aws/main.tf    | 16 ++++++++++++++++
 .../hazelcast5-storage-ec2/inventory_plan.yaml  | 13 +++++++++----
 14 files changed, 162 insertions(+), 25 deletions(-)

diff --git a/templates/hazelcast5-cp-ec2/aws/main.tf b/templates/hazelcast5-cp-ec2/aws/main.tf
index 99aef9101d..6a413fb40a 100644
--- a/templates/hazelcast5-cp-ec2/aws/main.tf
+++ b/templates/hazelcast5-cp-ec2/aws/main.tf
@@ -48,6 +48,8 @@ resource "aws_subnet" "subnet" {
     map_public_ip_on_launch = true
     tags = {
         Name = "Simulator Public Subnet ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -60,6 +62,8 @@ resource "aws_route_table" "route_table" {
 
     tags = {
         Name = "Simulator Public Subnet Route Table ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -86,6 +90,8 @@ resource "aws_security_group" "node-sg" {
     tags = {
         Name = "Simulator Node Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -144,6 +150,8 @@ resource "aws_instance" "nodes" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.nodes.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -161,6 +169,8 @@ resource "aws_security_group" "loadgenerator-sg" {
     tags = {
         Name = "Simulator Load Balancer Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -210,6 +220,8 @@ resource "aws_instance" "loadgenerators" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.loadgenerators.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 } 
 
@@ -227,6 +239,8 @@ resource "aws_security_group" "mc-sg" {
     tags = {
         Name = "Simulator MC Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     ingress {
@@ -275,6 +289,8 @@ resource "aws_instance" "mc" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.mc.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
diff --git a/templates/hazelcast5-cp-ec2/inventory_plan.yaml b/templates/hazelcast5-cp-ec2/inventory_plan.yaml
index f3dcda9047..82f32632eb 100644
--- a/templates/hazelcast5-cp-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-cp-ec2/inventory_plan.yaml
@@ -1,15 +1,20 @@
 provisioner: terraform
 terraform_plan: aws
 # Used for naming resources; give it some unique name specific to a set of benchmarks
-basename: gbarnett-ooaxh
+basename: <id>-<rnd:5>
 # Enter something here that identifies you.
-owner: gbarnett
+owner: <id>
 region: eu-central-1
 availability_zone: eu-central-1a
-vpc_id: vpc-002b5a4e5f8b8ece2
-internet_gateway_id: igw-02b8fe3ab75871205
-# Change the '20' to a different octet to prevent running into conflicts.
+#Engineering account VPC
+vpc_id: vpc-094e507d79a701227 
+#Engineering account igw
+internet_gateway_id: igw-03696757cca398137
+#Change the '20' to a different octet to prevent running into conflicts.
 cidr_block: 10.0.20.0/24
+#Change team information
+team: Cloud
+type: Benchmarking
 
 keypair:
     public_key: key.pub
diff --git a/templates/hazelcast5-ec2/aws/main.tf b/templates/hazelcast5-ec2/aws/main.tf
index a682438071..bd5dc759d1 100644
--- a/templates/hazelcast5-ec2/aws/main.tf
+++ b/templates/hazelcast5-ec2/aws/main.tf
@@ -48,6 +48,8 @@ resource "aws_subnet" "subnet" {
     map_public_ip_on_launch = true
     tags = {
         Name = "Simulator Public Subnet ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -60,6 +62,8 @@ resource "aws_route_table" "route_table" {
 
     tags = {
         Name = "Simulator Public Subnet Route Table ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -86,6 +90,8 @@ resource "aws_security_group" "node-sg" {
     tags = {
         Name = "Simulator Node Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -161,6 +167,8 @@ resource "aws_instance" "nodes" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.nodes.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -178,6 +186,8 @@ resource "aws_security_group" "loadgenerator-sg" {
     tags = {
         Name = "Simulator Load Balancer Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -244,6 +254,8 @@ resource "aws_instance" "loadgenerators" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.loadgenerators.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 } 
 
@@ -261,6 +273,8 @@ resource "aws_security_group" "mc-sg" {
     tags = {
         Name = "Simulator MC Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     ingress {
@@ -309,6 +323,8 @@ resource "aws_instance" "mc" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.mc.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
diff --git a/templates/hazelcast5-ec2/inventory_plan.yaml b/templates/hazelcast5-ec2/inventory_plan.yaml
index a08b1d918c..b8cfec28de 100644
--- a/templates/hazelcast5-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-ec2/inventory_plan.yaml
@@ -6,10 +6,15 @@ basename: <id>-<rnd:5>
 owner: <id>
 region: eu-central-1
 availability_zone: eu-central-1a
-vpc_id: vpc-002b5a4e5f8b8ece2
-internet_gateway_id: igw-02b8fe3ab75871205
-# Change the '20' to a different octet to prevent running into conflicts.
+#Engineering account VPC
+vpc_id: vpc-094e507d79a701227 
+#Engineering account igw
+internet_gateway_id: igw-03696757cca398137
+#Change the '20' to a different octet to prevent running into conflicts.
 cidr_block: 10.0.20.0/24
+#Change team information
+team: Cloud
+type: Benchmarking
 
 keypair:
     public_key: key.pub
diff --git a/templates/hazelcast5-hd-ec2/aws/main.tf b/templates/hazelcast5-hd-ec2/aws/main.tf
index 21ec65adb4..dff996a88f 100644
--- a/templates/hazelcast5-hd-ec2/aws/main.tf
+++ b/templates/hazelcast5-hd-ec2/aws/main.tf
@@ -48,6 +48,8 @@ resource "aws_subnet" "subnet" {
     map_public_ip_on_launch = true
     tags = {
         Name = "Simulator Public Subnet ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -60,6 +62,8 @@ resource "aws_route_table" "route_table" {
 
     tags = {
         Name = "Simulator Public Subnet Route Table ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -86,6 +90,8 @@ resource "aws_security_group" "node-sg" {
     tags = {
         Name = "Simulator Node Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -161,6 +167,8 @@ resource "aws_instance" "nodes" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.nodes.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -178,6 +186,8 @@ resource "aws_security_group" "loadgenerator-sg" {
     tags = {
         Name = "Simulator Load Balancer Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -244,6 +254,8 @@ resource "aws_instance" "loadgenerators" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.loadgenerators.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 } 
 
@@ -310,6 +322,8 @@ resource "aws_instance" "mc" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.mc.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
diff --git a/templates/hazelcast5-hd-ec2/inventory_plan.yaml b/templates/hazelcast5-hd-ec2/inventory_plan.yaml
index 6297cb742a..fe8b10cbf9 100644
--- a/templates/hazelcast5-hd-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-hd-ec2/inventory_plan.yaml
@@ -6,10 +6,15 @@ basename: <id>-<rnd:5>
 owner: <id>
 region: eu-central-1
 availability_zone: eu-central-1a
-vpc_id: vpc-002b5a4e5f8b8ece2
-internet_gateway_id: igw-02b8fe3ab75871205
-# Change the '20' to a different octet to prevent running into conflicts.
+#Engineering account VPC
+vpc_id: vpc-094e507d79a701227 
+#Engineering account igw
+internet_gateway_id: igw-03696757cca398137
+#Change the '20' to a different octet to prevent running into conflicts.
 cidr_block: 10.0.20.0/24
+#Change team information
+team: Cloud
+type: Benchmarking
 
 keypair:
     public_key: key.pub
diff --git a/templates/hazelcast5-sql-ec2-tstore/aws/main.tf b/templates/hazelcast5-sql-ec2-tstore/aws/main.tf
index b206ca458e..45cb09e131 100644
--- a/templates/hazelcast5-sql-ec2-tstore/aws/main.tf
+++ b/templates/hazelcast5-sql-ec2-tstore/aws/main.tf
@@ -48,6 +48,8 @@ resource "aws_subnet" "subnet" {
     map_public_ip_on_launch = true
     tags = {
         Name = "Simulator Public Subnet ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -60,6 +62,8 @@ resource "aws_route_table" "route_table" {
 
     tags = {
         Name = "Simulator Public Subnet Route Table ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -86,6 +90,8 @@ resource "aws_security_group" "node-sg" {
     tags = {
         Name = "Simulator Node Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     ingress {
@@ -153,6 +159,8 @@ resource "aws_instance" "nodes" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.nodes.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     # mount instance store to be used by Tiered Storage
@@ -182,6 +190,8 @@ resource "aws_security_group" "loadgenerator-sg" {
     tags = {
         Name = "Simulator Load Balancer Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     ingress {
@@ -248,6 +258,8 @@ resource "aws_instance" "loadgenerators" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.loadgenerators.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -314,6 +326,8 @@ resource "aws_instance" "mc" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.mc.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
diff --git a/templates/hazelcast5-sql-ec2-tstore/inventory_plan.yaml b/templates/hazelcast5-sql-ec2-tstore/inventory_plan.yaml
index a6babb91ec..b87c7fceb9 100644
--- a/templates/hazelcast5-sql-ec2-tstore/inventory_plan.yaml
+++ b/templates/hazelcast5-sql-ec2-tstore/inventory_plan.yaml
@@ -10,6 +10,9 @@ vpc_id: vpc-<your-vpc-id-here>
 internet_gateway_id: igw-<your-igw-id-here>
 # Change to a different cidr_block as-needed.
 cidr_block: 10.0.5.0/24
+#Change team information
+team: Cloud
+type: Benchmarking
 
 keypair:
     public_key: key.pub
diff --git a/templates/hazelcast5-sql-ec2/aws/main.tf b/templates/hazelcast5-sql-ec2/aws/main.tf
index 928b1c45ec..1de5da0f26 100644
--- a/templates/hazelcast5-sql-ec2/aws/main.tf
+++ b/templates/hazelcast5-sql-ec2/aws/main.tf
@@ -48,6 +48,8 @@ resource "aws_subnet" "subnet" {
     map_public_ip_on_launch = true
     tags = {
         Name = "Simulator Public Subnet ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -60,6 +62,8 @@ resource "aws_route_table" "route_table" {
 
     tags = {
         Name = "Simulator Public Subnet Route Table ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -86,6 +90,8 @@ resource "aws_security_group" "node-sg" {
     tags = {
         Name = "Simulator Node Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -153,6 +159,8 @@ resource "aws_instance" "nodes" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.nodes.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -170,6 +178,8 @@ resource "aws_security_group" "loadgenerator-sg" {
     tags = {
         Name = "Simulator Load Balancer Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -236,6 +246,8 @@ resource "aws_instance" "loadgenerators" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.loadgenerators.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 } 
 
@@ -253,6 +265,8 @@ resource "aws_security_group" "mc-sg" {
     tags = {
         Name = "Simulator MC Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     ingress {
@@ -301,6 +315,8 @@ resource "aws_instance" "mc" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.mc.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
diff --git a/templates/hazelcast5-sql-ec2/inventory_plan.yaml b/templates/hazelcast5-sql-ec2/inventory_plan.yaml
index 7612e3d0a1..030fd4590e 100644
--- a/templates/hazelcast5-sql-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-sql-ec2/inventory_plan.yaml
@@ -6,10 +6,15 @@ basename: <id>-<rnd:5>
 owner: <id>
 region: eu-central-1
 availability_zone: eu-central-1a
-vpc_id: vpc-002b5a4e5f8b8ece2
-internet_gateway_id: igw-02b8fe3ab75871205
-# Change the '20' to a different octet to prevent running into conflicts.
+#Engineering account VPC
+vpc_id: vpc-094e507d79a701227 
+#Engineering account igw
+internet_gateway_id: igw-03696757cca398137
+#Change the '20' to a different octet to prevent running into conflicts.
 cidr_block: 10.0.20.0/24
+#Change team information
+team: Cloud
+type: Benchmarking
 
 keypair:
     public_key: key.pub
diff --git a/templates/hazelcast5-sql-prunability-ec2/aws/main.tf b/templates/hazelcast5-sql-prunability-ec2/aws/main.tf
index 46fcc4cae1..b7822bed63 100644
--- a/templates/hazelcast5-sql-prunability-ec2/aws/main.tf
+++ b/templates/hazelcast5-sql-prunability-ec2/aws/main.tf
@@ -48,6 +48,8 @@ resource "aws_subnet" "subnet" {
     map_public_ip_on_launch = true
     tags = {
         Name = "Simulator Public Subnet ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -60,6 +62,8 @@ resource "aws_route_table" "route_table" {
 
     tags = {
         Name = "Simulator Public Subnet Route Table ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -84,6 +88,8 @@ resource "aws_security_group" "node-sg" {
     tags = {
         Name = "Simulator Node Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -151,6 +157,8 @@ resource "aws_instance" "nodes" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.nodes.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -168,6 +176,8 @@ resource "aws_security_group" "loadgenerator-sg" {
     tags = {
         Name = "Simulator Load Balancer Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -234,6 +244,8 @@ resource "aws_instance" "loadgenerators" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.loadgenerators.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 } 
 
@@ -300,6 +312,8 @@ resource "aws_instance" "mc" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.mc.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
diff --git a/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml b/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml
index e831e5d21d..9b4486ac22 100644
--- a/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml
@@ -1,17 +1,20 @@
 provisioner: terraform
 terraform_plan: aws
 # Used for naming resources; give it some unique name specific to a set of benchmarks
-basename: sashasyrotenko-pru-perf
+basename: <id>-<rnd:5>
 # Enter something here that identifies you.
-owner: sashasyrotenko
-placement_group_name: None
+owner: <id>
 region: eu-central-1
 availability_zone: eu-central-1a
-vpc_id: vpc-002b5a4e5f8b8ece2
-internet_gateway_id: igw-02b8fe3ab75871205
-# Change the '20' to a different octet to prevent running into conflicts.
+#Engineering account VPC
+vpc_id: vpc-094e507d79a701227 
+#Engineering account igw
+internet_gateway_id: igw-03696757cca398137
+#Change the '20' to a different octet to prevent running into conflicts.
 cidr_block: 10.0.20.0/24
-
+#Change team information
+team: Cloud
+type: Benchmarking
 keypair:
     public_key: key.pub
     private_key: key
diff --git a/templates/hazelcast5-storage-ec2/aws/main.tf b/templates/hazelcast5-storage-ec2/aws/main.tf
index 7a5c19d2d1..1670560ed9 100644
--- a/templates/hazelcast5-storage-ec2/aws/main.tf
+++ b/templates/hazelcast5-storage-ec2/aws/main.tf
@@ -48,6 +48,8 @@ resource "aws_subnet" "subnet" {
     map_public_ip_on_launch = true
     tags = {
         Name = "Simulator Public Subnet ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -60,6 +62,8 @@ resource "aws_route_table" "route_table" {
 
     tags = {
         Name = "Simulator Public Subnet Route Table ${local.settings.basename}"
+        team  = local.settings.team
+        type  = local.settings.type
     }
 }
 
@@ -86,6 +90,8 @@ resource "aws_security_group" "node-sg" {
     tags = {
         Name = "Simulator Node Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -161,6 +167,8 @@ resource "aws_instance" "nodes" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.nodes.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
@@ -196,6 +204,8 @@ resource "aws_security_group" "loadgenerator-sg" {
     tags = {
         Name = "Simulator Load Balancer Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
     
     ingress {
@@ -262,6 +272,8 @@ resource "aws_instance" "loadgenerators" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.loadgenerators.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 } 
 
@@ -279,6 +291,8 @@ resource "aws_security_group" "mc-sg" {
     tags = {
         Name = "Simulator MC Security Group ${local.settings.basename}",
         Owner = local.settings.owner
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     ingress {
@@ -327,6 +341,8 @@ resource "aws_instance" "mc" {
         Owner = local.settings.owner
         "passthrough:ansible_ssh_private_key_file" = local.settings.keypair.private_key
         "passthrough:ansible_user" = local.settings.mc.user
+        team  = local.settings.team
+        type  = local.settings.type
     }
 
     connection {
diff --git a/templates/hazelcast5-storage-ec2/inventory_plan.yaml b/templates/hazelcast5-storage-ec2/inventory_plan.yaml
index 5e1084fee3..3451d52aa2 100644
--- a/templates/hazelcast5-storage-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-storage-ec2/inventory_plan.yaml
@@ -7,10 +7,15 @@ owner: <id>
 placement_group_name: None
 region: eu-central-1
 availability_zone: eu-central-1a
-vpc_id: vpc-002b5a4e5f8b8ece2
-internet_gateway_id: igw-02b8fe3ab75871205
-# Change the '20' to a different octet to prevent running into conflicts.
-cidr_block: 10.0.50.0/24
+#Engineering account VPC
+vpc_id: vpc-094e507d79a701227 
+#Engineering account igw
+internet_gateway_id: igw-03696757cca398137
+#Change the '20' to a different octet to prevent running into conflicts.
+cidr_block: 10.0.20.0/24
+#Change team information
+team: Cloud
+type: Benchmarking
 
 keypair:
     public_key: key.pub

From 6dd0867f41d3d29682e0ca0d2b0eacebd40b7ebb Mon Sep 17 00:00:00 2001
From: Taylan Erden <tayfuntaylanerden@gmail.com>
Date: Mon, 2 Dec 2024 15:38:29 +0000
Subject: [PATCH 2/4] SRE-2231 update typo

---
 templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml | 1 +
 templates/hazelcast5-storage-ec2/inventory_plan.yaml         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml b/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml
index 9b4486ac22..cdc7079f29 100644
--- a/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-sql-prunability-ec2/inventory_plan.yaml
@@ -4,6 +4,7 @@ terraform_plan: aws
 basename: <id>-<rnd:5>
 # Enter something here that identifies you.
 owner: <id>
+placement_group_name: None
 region: eu-central-1
 availability_zone: eu-central-1a
 #Engineering account VPC
diff --git a/templates/hazelcast5-storage-ec2/inventory_plan.yaml b/templates/hazelcast5-storage-ec2/inventory_plan.yaml
index 3451d52aa2..09ea52dbb9 100644
--- a/templates/hazelcast5-storage-ec2/inventory_plan.yaml
+++ b/templates/hazelcast5-storage-ec2/inventory_plan.yaml
@@ -12,7 +12,7 @@ vpc_id: vpc-094e507d79a701227
 #Engineering account igw
 internet_gateway_id: igw-03696757cca398137
 #Change the '20' to a different octet to prevent running into conflicts.
-cidr_block: 10.0.20.0/24
+cidr_block: 10.0.50.0/24
 #Change team information
 team: Cloud
 type: Benchmarking

From 5ef43d4b3311fc6f960f8ba0baaadbad11a51e2b Mon Sep 17 00:00:00 2001
From: Taylan Erden <taylan.erden@hazelcast.com>
Date: Fri, 6 Dec 2024 11:21:22 +0000
Subject: [PATCH 3/4] SRE-2231 readme update for tags

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d40997be3e..6eca60d6f8 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ Simulator makes use of Terraform for provisioning. After you have created a benc
 `perftest create` command, you want to edit the `inventory_plan.yaml`. This is where you can configure the
 type of instances, the number etc. The specified `cidr_block` will need to be updated to prevent conflicts.
 
-To provision the environment, you will first need to configure your AWS credentials:
+To provision the environment, you will first need to configure your AWS credentials and update team tag on inventory_plan according to the values on following [repository](https://github.com/hazelcast/aws-hazelcast-inc-iac/blob/main/README.md#aws-tagging-guidelines):
 
 In your `~/.aws/credentials` file you need something like this:
 
@@ -182,7 +182,7 @@ aws_session_token=AQoEXAMPLEH4aoAH0gNCAPyJxz4BlCFFxWNE1OPTgk5TthT+FvwqnKwRcOIfrR
 
 Or alternatively you can use `aws sso login` and autorize your terminal via SSO.
 
-To apply the configuration on an existing environment, execute the following command from within the benchmark
+To apply the configuration on an existing environment, execute the following command from within the benchmark.
 directory:
 
    ```shell

From 644ec0d181824ddcb0d215f43ca70163c990c7c6 Mon Sep 17 00:00:00 2001
From: Taylan Erden <taylan.erden@hazelcast.com>
Date: Fri, 6 Dec 2024 11:24:51 +0000
Subject: [PATCH 4/4] SRE-2231 readme update for tags

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6eca60d6f8..c6b351f347 100644
--- a/README.md
+++ b/README.md
@@ -182,7 +182,7 @@ aws_session_token=AQoEXAMPLEH4aoAH0gNCAPyJxz4BlCFFxWNE1OPTgk5TthT+FvwqnKwRcOIfrR
 
 Or alternatively you can use `aws sso login` and autorize your terminal via SSO.
 
-To apply the configuration on an existing environment, execute the following command from within the benchmark.
+To apply the configuration on an existing environment, execute the following command from within the benchmark
 directory:
 
    ```shell