feat(terraform): Extend AWS reservations

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: Ia17a415725aa2b960fb54a5de85af3d105028152

diff --git a/csit.infra.dash/app/.ebextensions/env-flask.config b/csit.infra.dash/app/.ebextensions/env-flask.config
index 795aa82..9c4b603 100644 (file)
--- a/csit.infra.dash/app/.ebextensions/env-flask.config
+++ b/csit.infra.dash/app/.ebextensions/env-flask.config
@@ -15,4 +15,4 @@ option_settings:
     CSIT_URL_CICD: "https://jenkins.fd.io/job/"
     CSIT_URL_LOGS: "https://logs.fd.io/vex-yul-rot-jenkins-1/"
     CSIT_URL_DOC: "https://csit.fd.io/cdocs/"
-    CSIT_TIME_PERIOD: 250
\ No newline at end of file
+    CSIT_TIME_PERIOD: 200
\ No newline at end of file

diff --git a/csit.infra.dash/app/cdash/data/data.yaml b/csit.infra.dash/app/cdash/data/data.yaml
index 36fb450..acf32c9 100644 (file)
--- a/csit.infra.dash/app/cdash/data/data.yaml
+++ b/csit.infra.dash/app/cdash/data/data.yaml
@@ -112,271 +112,6 @@
     - telemetry
     - test_id
     - version
-- data_type: iterative
-  partition: test_type
-  partition_name: mrr
-  release: rls2310
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2310
-  schema: iterative_rls2310_mrr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_receive_rate_rate_avg
-    - result_receive_rate_rate_stdev
-    - result_receive_rate_rate_unit
-    - result_receive_rate_rate_values
-- data_type: iterative
-  partition: test_type
-  partition_name: ndrpdr
-  release: rls2310
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2310
-  schema: iterative_rls2310_ndrpdr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_pdr_lower_rate_unit
-    - result_pdr_lower_rate_value
-    - result_ndr_lower_rate_unit
-    - result_ndr_lower_rate_value
-    - result_pdr_lower_bandwidth_unit
-    - result_pdr_lower_bandwidth_value
-    - result_ndr_lower_bandwidth_unit
-    - result_ndr_lower_bandwidth_value
-    - result_latency_reverse_pdr_90_hdrh
-    - result_latency_reverse_pdr_50_hdrh
-    - result_latency_reverse_pdr_10_hdrh
-    - result_latency_reverse_pdr_0_hdrh
-    - result_latency_forward_pdr_90_hdrh
-    - result_latency_forward_pdr_50_avg
-    - result_latency_forward_pdr_50_hdrh
-    - result_latency_forward_pdr_50_unit
-    - result_latency_forward_pdr_10_hdrh
-    - result_latency_forward_pdr_0_hdrh
-- data_type: iterative
-  partition: test_type
-  partition_name: hoststack
-  release: rls2310
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2310
-  schema: iterative_rls2310_hoststack
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - tg_type
-    - result_bandwidth_unit
-    - result_bandwidth_value
-    - result_rate_unit
-    - result_rate_value
-    - start_time
-    - passed
-    - test_id
-    - version
-- data_type: coverage
-  partition: test_type
-  partition_name: ndrpdr
-  release: rls2310
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2310
-  schema: coverage_rls2310_ndrpdr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - tg_type
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_pdr_lower_rate_unit
-    - result_pdr_lower_rate_value
-    - result_ndr_lower_rate_value
-    - result_pdr_lower_bandwidth_value
-    - result_ndr_lower_bandwidth_value
-    - result_latency_reverse_pdr_90_hdrh
-    - result_latency_reverse_pdr_50_hdrh
-    - result_latency_reverse_pdr_10_hdrh
-    - result_latency_forward_pdr_90_hdrh
-    - result_latency_forward_pdr_50_hdrh
-    - result_latency_forward_pdr_10_hdrh
-- data_type: coverage
-  partition: test_type
-  partition_name: mrr
-  release: rls2310
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2310
-  schema: iterative_rls2310_mrr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_receive_rate_rate_avg
-    - result_receive_rate_rate_stdev
-    - result_receive_rate_rate_unit
-- data_type: coverage
-  partition: test_type
-  partition_name: device
-  release: rls2310
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2310
-  schema: coverage_rls2310_device
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - passed
-    - test_id
-    - version
-- data_type: iterative
-  partition: test_type
-  partition_name: mrr
-  release: rls2402
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2402
-  schema: iterative_rls2402_mrr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_receive_rate_rate_avg
-    - result_receive_rate_rate_stdev
-    - result_receive_rate_rate_unit
-    - result_receive_rate_bandwidth_avg
-    - result_receive_rate_bandwidth_stdev
-    - result_receive_rate_bandwidth_unit
-- data_type: iterative
-  partition: test_type
-  partition_name: ndrpdr
-  release: rls2402
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2402
-  schema: iterative_rls2402_ndrpdr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_pdr_lower_rate_unit
-    - result_pdr_lower_rate_value
-    - result_ndr_lower_rate_unit
-    - result_ndr_lower_rate_value
-    - result_pdr_lower_bandwidth_unit
-    - result_pdr_lower_bandwidth_value
-    - result_ndr_lower_bandwidth_unit
-    - result_ndr_lower_bandwidth_value
-    - result_latency_reverse_pdr_90_hdrh
-    - result_latency_reverse_pdr_50_hdrh
-    - result_latency_reverse_pdr_10_hdrh
-    - result_latency_reverse_pdr_0_hdrh
-    - result_latency_forward_pdr_90_hdrh
-    - result_latency_forward_pdr_50_avg
-    - result_latency_forward_pdr_50_hdrh
-    - result_latency_forward_pdr_50_unit
-    - result_latency_forward_pdr_10_hdrh
-    - result_latency_forward_pdr_0_hdrh
-- data_type: iterative
-  partition: test_type
-  partition_name: hoststack
-  release: rls2402
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2402
-  schema: iterative_rls2402_hoststack
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - hosts
-    - tg_type
-    - result_bandwidth_unit
-    - result_bandwidth_value
-    - result_rate_unit
-    - result_rate_value
-    - start_time
-    - passed
-    - test_id
-    - version
-- data_type: coverage
-  partition: test_type
-  partition_name: ndrpdr
-  release: rls2402
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2402
-  schema: coverage_rls2402_ndrpdr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - tg_type
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_pdr_lower_rate_unit
-    - result_pdr_lower_rate_value
-    - result_ndr_lower_rate_value
-    - result_pdr_lower_bandwidth_value
-    - result_ndr_lower_bandwidth_value
-    - result_latency_reverse_pdr_90_hdrh
-    - result_latency_reverse_pdr_50_hdrh
-    - result_latency_reverse_pdr_10_hdrh
-    - result_latency_forward_pdr_90_hdrh
-    - result_latency_forward_pdr_50_hdrh
-    - result_latency_forward_pdr_10_hdrh
-- data_type: coverage
-  partition: test_type
-  partition_name: mrr
-  release: rls2402
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2402
-  schema: iterative_rls2402_mrr
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - start_time
-    - passed
-    - test_id
-    - version
-    - result_receive_rate_rate_avg
-    - result_receive_rate_rate_stdev
-    - result_receive_rate_rate_unit
-- data_type: coverage
-  partition: test_type
-  partition_name: device
-  release: rls2402
-  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2402
-  schema: coverage_rls2402_device
-  columns:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - passed
-    - test_id
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: mrr

diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf
index b706d77..9002e55 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf
@@ -1,7 +1,7 @@
 variable "region" {
   description = "AWS Region."
   type        = string
-  default     = "eu-north-1"
+  default     = "us-east-1"
 }
 
 variable "vault_provider_address" {
@@ -30,7 +30,7 @@ variable "vault_name" {
 variable "application_bucket" {
   description = "The name of the bucket."
   type        = string
-  default     = "elasticbeanstalk-eu-north-1-407116685360"
+  default     = "elasticbeanstalk-us-east-1-407116685360"
 }
 
 variable "application_description" {
@@ -42,7 +42,7 @@ variable "application_description" {
 variable "application_name" {
   description = "Name of the Beanstalk Application."
   type        = string
-  default     = "fdio-csit-dash-app-m7g"
+  default     = "fdio-csit-dash-app-m8g"
 }
 
 variable "application_source" {

diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
index 9f115cd..431d679 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
+++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
@@ -1,5 +1,6 @@
-data "vault_generic_secret" "fdio_docs" {
-  path = "kv/secret/data/etl/fdio_docs"
+data "vault_kv_secret_v2" "fdio_docs" {
+  mount = "kv"
+  name  = "etl/fdio_docs"
 }
 
 data "vault_aws_access_credentials" "creds" {
@@ -11,8 +12,8 @@ module "elastic_beanstalk_application" {
   source = "../terraform-aws-elastic-beanstalk-application"
 
   # application
-  application_description                    = "FD.io CDASH M7G"
-  application_name                           = "fdio-csit-dash-app-m7g"
+  application_description                    = "FD.io CDASH M8G"
+  application_name                           = "fdio-csit-dash-app-m8g"
   appversion_lifecycle_service_role_arn      = "arn:aws:iam::407116685360:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk"
   appversion_lifecycle_max_count             = 10
   appversion_lifecycle_delete_source_from_s3 = false
@@ -22,7 +23,7 @@ module "elastic_beanstalk_environment" {
   source = "../terraform-aws-elastic-beanstalk-environment"
 
   # environment
-  application_name = "fdio-csit-dash-app-m7g"
+  application_name = "fdio-csit-dash-app-m8g"
 
   # vpc
   vpc_cidr_block           = "10.0.0.0/16"
@@ -31,22 +32,22 @@ module "elastic_beanstalk_environment" {
   vpc_instance_tenancy     = "default"
 
   # subnet
-  subnet_a_availability_zone = "eu-north-1a"
+  subnet_a_availability_zone = "us-east-1a"
   subnet_a_cidr_block        = "10.0.0.0/20"
-  subnet_b_availability_zone = "eu-north-1b"
+  subnet_b_availability_zone = "us-east-1b"
   subnet_b_cidr_block        = "10.0.16.0/20"
 
   # environment
   environment_application            = module.elastic_beanstalk_application.application_name
   environment_description            = module.elastic_beanstalk_application.application_description
-  environment_name                   = "fdio-csit-dash-env-m7g"
-  environment_solution_stack_name    = "64bit Amazon Linux 2023 v4.0.6 running Python 3.11"
+  environment_name                   = "fdio-csit-dash-env-m8g"
+  environment_solution_stack_name    = "64bit Amazon Linux 2023 v4.3.2 running Python 3.12"
   environment_tier                   = "WebServer"
   environment_wait_for_ready_timeout = "25m"
   environment_version_label          = ""
 
   # aws:ec2:instances
-  instances_instance_types = "m7g.2xlarge"
+  instances_instance_types = "m8g.2xlarge"
 
   # aws:ec2:vpc
   associate_public_ip_address = true
@@ -57,7 +58,7 @@ module "elastic_beanstalk_environment" {
 
   # aws:elasticbeanstalk:environment
   environment_loadbalancer_type               = "application"
-  environment_loadbalancer_ssl_certificate_id = "arn:aws:acm:eu-north-1:407116685360:certificate/3ef3c6ae-f1d4-49f0-a8cd-5d090991bf73"
+  environment_loadbalancer_ssl_certificate_id = "arn:aws:acm:us-east-1:407116685360:certificate/3439b8aa-4f07-496f-a2de-e38159050c85"
 
   # aws:elasticbeanstalk:environment:process:default
   environment_process_default_healthcheck_interval      = 10
@@ -117,8 +118,8 @@ module "elastic_beanstalk_environment" {
 
   # aws:elasticbeanstalk:application:environment
   environment_variables = {
-    "AWS_ACCESS_KEY_ID"     = data.vault_generic_secret.fdio_docs.data["access_key"]
-    "AWS_SECRET_ACCESS_KEY" = data.vault_generic_secret.fdio_docs.data["secret_key"]
-    "AWS_DEFAULT_REGION"    = data.vault_generic_secret.fdio_docs.data["region"]
+    "AWS_ACCESS_KEY_ID"     = data.vault_kv_secret_v2.fdio_docs.data["access_key"]
+    "AWS_SECRET_ACCESS_KEY" = data.vault_kv_secret_v2.fdio_docs.data["secret_key"]
+    "AWS_DEFAULT_REGION"    = data.vault_kv_secret_v2.fdio_docs.data["region"]
   }
 }

diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf
index d7ff1d1..968cd4c 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf
@@ -1,7 +1,7 @@
 variable "region" {
   description = "AWS Region."
   type        = string
-  default     = "eu-north-1"
+  default     = "us-east-1"
 }
 
 variable "vault_provider_address" {

diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf
index 153890e..356c0aa 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf
+++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf
@@ -2,16 +2,16 @@ terraform {
   backend "consul" {
     address = "10.30.51.24:8500"
     scheme  = "http"
-    path    = "terraform/dash_m7g"
+    path    = "terraform/dash_m8g"
   }
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.31.0"
+      version = ">= 5.83.1"
     }
     vault = {
-      version = ">= 3.23.0"
+      version = ">= 4.6.0"
     }
   }
-  required_version = ">= 1.4.2"
+  required_version = ">= 1.10.4"
 }