From 25d2ea710b8b0a64876dc1e9ea576cd5f672bd95 Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Thu, 23 May 2024 18:42:11 +0200 Subject: [PATCH] [CI] Metricbeat: set AWS region to terraform.tf (#39675) * [CI] Metricbeat: set AWS region to terraform.tf * Cleanup * Fix DB instance type (cherry picked from commit 44679fb9c6082e39ba0522ff2a41ab72a2d45ffd) --- .buildkite/x-pack/pipeline.xpack.metricbeat.yml | 2 -- x-pack/metricbeat/module/aws/terraform.tf | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index 4156850f7ae..324678acbda 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -249,8 +249,6 @@ steps: - label: ":linux: Cloud (MODULE) Tests" key: "x-pack-metricbeat-extended-cloud-test" - skip: "Not a stage on Jenkins & elastic/ingest-dev#3170" - # https://github.com/elastic/ingest-dev/issues/3170 if: build.env("GITHUB_PR_LABELS") =~ /.*aws.*/ command: | set -euo pipefail diff --git a/x-pack/metricbeat/module/aws/terraform.tf b/x-pack/metricbeat/module/aws/terraform.tf index 991650b1433..7f27bda98f6 100644 --- a/x-pack/metricbeat/module/aws/terraform.tf +++ b/x-pack/metricbeat/module/aws/terraform.tf @@ -1,5 +1,6 @@ provider "aws" { version = "~> 3.33" + region = "us-east-1" default_tags { tags = { environment = var.ENVIRONMENT @@ -32,7 +33,7 @@ resource "aws_db_instance" "test" { identifier = "metricbeat-test-${random_id.suffix.hex}" allocated_storage = 20 // Gigabytes engine = "mysql" - instance_class = "db.t2.micro" + instance_class = "db.t3.micro" name = "metricbeattest" username = "foo" password = random_password.db.result