From 2555e856d4eae6b2fada1ab29e83b94fe7e458bd Mon Sep 17 00:00:00 2001 From: Kostiantyn Masliuk <1pkg@protonmail.com> Date: Fri, 1 Nov 2024 15:43:51 -0700 Subject: [PATCH 1/4] benchmarks: move to gcp-cpu-optimized template (#14515) --- testing/benchmark/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/benchmark/variables.tf b/testing/benchmark/variables.tf index b06a4d7a6b2..f3c65302eb7 100644 --- a/testing/benchmark/variables.tf +++ b/testing/benchmark/variables.tf @@ -20,7 +20,7 @@ variable "ess_region" { } variable "deployment_template" { - default = "gcp-compute-optimized-v3" + default = "gcp-cpu-optimized" description = "Optional deployment template. Defaults to the CPU optimized template for GCP" type = string } From 9c7439f30167dcd7d4bd44e0473b0f249ce5fa8d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 4 Nov 2024 09:22:19 +0100 Subject: [PATCH 2/4] github-actions: fixes gh command not found (#14484) --- release.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release.mk b/release.mk index 9e83e9f584c..9db2b3b8d40 100644 --- a/release.mk +++ b/release.mk @@ -39,12 +39,14 @@ PROJECT_PATCH_VERSION ?= $(shell echo $(RELEASE_VERSION) | cut -f3 -d.) PROJECT_OWNER ?= elastic RELEASE_TYPE ?= minor +# if gh is installed only +ifneq ($(shell command -v gh 2>/dev/null),) CURRENT_RELEASE ?= $(shell gh release list --exclude-drafts --exclude-pre-releases --repo elastic/apm-server --limit 10 --json tagName --jq '.[].tagName|select(. | startswith("v$(PROJECT_MAJOR_VERSION)"))' | sed 's|v||g' | sort -r | head -n 1) RELEASE_BRANCH ?= $(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION) NEXT_PROJECT_MINOR_VERSION ?= $(PROJECT_MAJOR_VERSION).$(shell expr $(PROJECT_MINOR_VERSION) + 1).0 NEXT_RELEASE ?= $(RELEASE_BRANCH).$(shell expr $(PROJECT_PATCH_VERSION) + 1) - BRANCH_PATCH = update-$(NEXT_RELEASE) +endif # for the view commits # as long as 8.x is the branch to run releases, then the base branch is 8.x From 8be6ec26561e83f4b5fd87b38939486a1da520a6 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:26:20 +0000 Subject: [PATCH 3/4] [updatecli] Bump elastic stack version to 9.0.0-a3ebfafa (#14504) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d3f317dacd8..e69142b1d27 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ x-logging: &default-logging services: elasticsearch: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-bb296cd9-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-a3ebfafa-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -43,7 +43,7 @@ services: kibana: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/kibana/kibana:9.0.0-bb296cd9-SNAPSHOT + image: docker.elastic.co/kibana/kibana:9.0.0-a3ebfafa-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -63,7 +63,7 @@ services: metricbeat: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/beats/metricbeat:9.0.0-bb296cd9-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:9.0.0-a3ebfafa-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 78812ca199b..bdfc4b6cd48 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -4,7 +4,7 @@ metadata: name: apm-server spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-bb296cd9-SNAPSHOT + version: 9.0.0-a3ebfafa-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 18b89eae44a..d57105c723e 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -4,7 +4,7 @@ metadata: name: elasticsearch spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-bb296cd9-SNAPSHOT + version: 9.0.0-a3ebfafa-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 0ad0b7953ba..3c75a34647c 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -4,7 +4,7 @@ metadata: name: kibana spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-bb296cd9-SNAPSHOT + version: 9.0.0-a3ebfafa-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 83a0e8abe31a6124e95c034b5d6fc5ac6ca5d267 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:47:41 +0000 Subject: [PATCH 4/4] build(deps): bump google-github-actions/get-secretmanager-secrets (#14517) Bumps the github-actions group with 1 update: [google-github-actions/get-secretmanager-secrets](https://github.com/google-github-actions/get-secretmanager-secrets). Updates `google-github-actions/get-secretmanager-secrets` from 2.2.1 to 2.2.2 - [Release notes](https://github.com/google-github-actions/get-secretmanager-secrets/releases) - [Changelog](https://github.com/google-github-actions/get-secretmanager-secrets/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/get-secretmanager-secrets/compare/0eee3cd066acdd9427a820bd68231cdea7c66a8d...e5bb06c2ca53b244f978d33348d18317a7f263ce) --- updated-dependencies: - dependency-name: google-github-actions/get-secretmanager-secrets dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/benchmarks.yml | 4 ++-- .github/workflows/smoke-tests-ess.yml | 4 ++-- .github/workflows/smoke-tests-os.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 3ca4d1095f6..4e66fb40419 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -99,7 +99,7 @@ jobs: with: role-duration-seconds: 18000 # 5 hours - - uses: google-github-actions/get-secretmanager-secrets@0eee3cd066acdd9427a820bd68231cdea7c66a8d # v2.2.1 + - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2 with: export_to_environment: true secrets: |- @@ -235,7 +235,7 @@ jobs: # there is a high chance things will stop working # This is trying to reduce the chances of that happening. # See https://github.com/elastic/observability-test-environments/actions/workflows/cluster-rotate-api-keys.yml - - uses: google-github-actions/get-secretmanager-secrets@0eee3cd066acdd9427a820bd68231cdea7c66a8d # v2.2.1 + - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2 if: always() with: export_to_environment: true diff --git a/.github/workflows/smoke-tests-ess.yml b/.github/workflows/smoke-tests-ess.yml index 72e066113eb..f107720ae10 100644 --- a/.github/workflows/smoke-tests-ess.yml +++ b/.github/workflows/smoke-tests-ess.yml @@ -64,7 +64,7 @@ jobs: - uses: elastic/oblt-actions/google/auth@v1 - - uses: google-github-actions/get-secretmanager-secrets@0eee3cd066acdd9427a820bd68231cdea7c66a8d # v2.2.1 + - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2 with: export_to_environment: true secrets: |- @@ -77,7 +77,7 @@ jobs: # there is a high chance things will stop working # This is trying to reduce the chances of that happening. # See https://github.com/elastic/observability-test-environments/actions/workflows/cluster-rotate-api-keys.yml - - uses: google-github-actions/get-secretmanager-secrets@0eee3cd066acdd9427a820bd68231cdea7c66a8d # v2.2.1 + - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2 if: always() with: export_to_environment: true diff --git a/.github/workflows/smoke-tests-os.yml b/.github/workflows/smoke-tests-os.yml index 55cbcba7cf9..157cd86ab1c 100644 --- a/.github/workflows/smoke-tests-os.yml +++ b/.github/workflows/smoke-tests-os.yml @@ -59,7 +59,7 @@ jobs: - uses: elastic/oblt-actions/google/auth@v1 - - uses: google-github-actions/get-secretmanager-secrets@0eee3cd066acdd9427a820bd68231cdea7c66a8d # v2.2.1 + - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2 with: export_to_environment: true secrets: |-