From 900106d3dbc1ed12be097c8e02a68530da9a869a Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 1 Feb 2024 05:12:03 -0500 Subject: [PATCH 1/7] chore: Update to elastic/beats@5d1c59247f7b (#12526) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 7d458f47f76..2af413792ae 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240130132105-9f58fef62910 +Version: v7.0.0-alpha2.0.20240131144102-5d1c59247f7b Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240130132105-9f58fef62910/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240131144102-5d1c59247f7b/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 2b9f654a467..057dddd16dc 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240130132105-9f58fef62910 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240131144102-5d1c59247f7b github.com/elastic/elastic-agent-client/v7 v7.6.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index 049826ab89e..ed2c2670710 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c h1:R9OfYHW0qCEFJ/bh9Tj/+j4x7o8lnW7yXQNHlvuXjJ0= github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240130132105-9f58fef62910 h1:jfWpEUAZBssLZUSfbtY5ua5EwFw48g10znSRWlzIOsQ= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240130132105-9f58fef62910/go.mod h1:wfgvi7cRCNpBPS9pVyGBYNQc0SKx7rdXtE8l4K4e1c8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240131144102-5d1c59247f7b h1:JvtH27uM9LX6/V+M/w0NwIjTtp78X6yf/ibF2Xxp0cw= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240131144102-5d1c59247f7b/go.mod h1:wfgvi7cRCNpBPS9pVyGBYNQc0SKx7rdXtE8l4K4e1c8= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.6.0 h1:FEn6FjzynW4TIQo5G096Tr7xYK/P5LY9cSS6wRbXZTc= From dd513ef99184d2c3bb2dc073b2784e7c7f0b3417 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:55:46 +0000 Subject: [PATCH 2/7] build(deps): bump the github-actions group with 1 update (#12534) Bumps the github-actions group with 1 update: [hashicorp/vault-action](https://github.com/hashicorp/vault-action). Updates `hashicorp/vault-action` from 2.7.4 to 2.7.5 - [Release notes](https://github.com/hashicorp/vault-action/releases) - [Changelog](https://github.com/hashicorp/vault-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/vault-action/compare/v2.7.4...v2.7.5) --- updated-dependencies: - dependency-name: hashicorp/vault-action 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 59e1adf2a20..28af92dd5a9 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -67,7 +67,7 @@ jobs: echo "BENCHMARK_RUN=${{ inputs.benchmarkRun }}" >> "$GITHUB_ENV" fi - - uses: hashicorp/vault-action@v2.7.4 + - uses: hashicorp/vault-action@v2.7.5 env: AWS_CREDENTIALS_PATH: secret/observability-team/ci/elastic-observability-aws-account-auth BENCHMARK_CLOUD_CREDENTIALS_PATH: secret/observability-team/ci/benchmark-cloud From 0afd2e08511dcc8f644e1b68261131a21381bbe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:36:12 +0000 Subject: [PATCH 3/7] build(deps): bump the github-actions group (#12531) Bumps the github-actions group in /.github/workflows/setup-cluster-env with 1 update: [hashicorp/vault-action](https://github.com/hashicorp/vault-action). Updates `hashicorp/vault-action` from 2.7.4 to 2.7.5 - [Release notes](https://github.com/hashicorp/vault-action/releases) - [Changelog](https://github.com/hashicorp/vault-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/vault-action/compare/v2.7.4...v2.7.5) --- updated-dependencies: - dependency-name: hashicorp/vault-action 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> Co-authored-by: Victor Martinez --- .github/workflows/setup-cluster-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/setup-cluster-env/action.yml b/.github/workflows/setup-cluster-env/action.yml index c61145fd60c..5bde63ed343 100644 --- a/.github/workflows/setup-cluster-env/action.yml +++ b/.github/workflows/setup-cluster-env/action.yml @@ -31,7 +31,7 @@ runs: cache-dependency-path: | go.sum tools/go.sum - - uses: hashicorp/vault-action@v2.7.4 + - uses: hashicorp/vault-action@v2.7.5 with: url: ${{ inputs.vault-url }} roleId: ${{ inputs.vault-role-id }} From fd6912a7e810f7bb5b268036470572b279a21129 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Thu, 1 Feb 2024 17:11:30 +0100 Subject: [PATCH 4/7] Fix dependabot PRs (#12543) * Add update-dependabot-pr workflow * Ignore if NOTICE.txt was changed to prevent multiple runs * Remove copy-paste error --- .github/workflows/update-dependabot-pr.yml | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/update-dependabot-pr.yml diff --git a/.github/workflows/update-dependabot-pr.yml b/.github/workflows/update-dependabot-pr.yml new file mode 100644 index 00000000000..39ea7f42819 --- /dev/null +++ b/.github/workflows/update-dependabot-pr.yml @@ -0,0 +1,42 @@ +--- +# Dependabot Pull Requests are not updating the NOTICE.txt file, which causes the lint job to fail. +# This workflow will checkout the dependabot PR, update the NOTICE.txt file, and push the changes back to the PR. +name: update-dependabot-pr + +on: + workflow_dispatch: ~ # This gives us the ability to run it for existing PRs where dependabot has already created a PR + push: + branches: + - dependabot/go_modules/** + paths-ignore: + - NOTICE.txt + +permissions: + contents: read + +jobs: + update-dependbot-pr: + runs-on: ubuntu-latest + steps: + - uses: elastic/apm-pipeline-library/.github/actions/github-token@current + with: + url: ${{ secrets.VAULT_ADDR }} + roleId: ${{ secrets.VAULT_ROLE_ID }} + secretId: ${{ secrets.VAULT_SECRET_ID }} + - uses: elastic/apm-pipeline-library/.github/actions/setup-git@current + with: + username: ${{ env.GIT_USER }} + email: ${{ env.GIT_EMAIL }} + token: ${{ env.GITHUB_TOKEN }} + - uses: actions/checkout@v4 + with: + token: ${{ env.GITHUB_TOKEN }} + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + - name: Update NOTICE.txt + run: make notice + - run: | + git diff --exit-code NOTICE.txt || (git add NOTICE.txt && git commit -am "Update NOTICE.txt") + git push + From 17211d4ff546812e75e93b262e79fcfcb01afa26 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:22:35 -0500 Subject: [PATCH 5/7] [updatecli] Bump elastic stack version to 8.13.0-por0bbe1 (#12546) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine 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 4be49a4bd34..2c3a0d42e52 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-yil7wib0-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-por0bbe1-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.13.0-yil7wib0-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.13.0-por0bbe1-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.13.0-yil7wib0-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.13.0-por0bbe1-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 c8ff097bddb..88c5fbf1e31 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.13.0-yil7wib0-SNAPSHOT + version: 8.13.0-por0bbe1-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index ebcba691f5f..01c7300da33 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.13.0-yil7wib0-SNAPSHOT + version: 8.13.0-por0bbe1-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 60e826ec3d7..453791dfe8e 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.13.0-yil7wib0-SNAPSHOT + version: 8.13.0-por0bbe1-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From eb4a48809c123c75cebcd745d5436dfb4833163b Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:32:20 -0500 Subject: [PATCH 6/7] chore: Update to elastic/beats@eae57f95df94 (#12545) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 2af413792ae..a537a38ddc2 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240131144102-5d1c59247f7b +Version: v7.0.0-alpha2.0.20240201135447-eae57f95df94 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240131144102-5d1c59247f7b/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240201135447-eae57f95df94/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 057dddd16dc..fa4f0338d2b 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240131144102-5d1c59247f7b + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240201135447-eae57f95df94 github.com/elastic/elastic-agent-client/v7 v7.6.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index ed2c2670710..0af28b0169c 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c h1:R9OfYHW0qCEFJ/bh9Tj/+j4x7o8lnW7yXQNHlvuXjJ0= github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240131144102-5d1c59247f7b h1:JvtH27uM9LX6/V+M/w0NwIjTtp78X6yf/ibF2Xxp0cw= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240131144102-5d1c59247f7b/go.mod h1:wfgvi7cRCNpBPS9pVyGBYNQc0SKx7rdXtE8l4K4e1c8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240201135447-eae57f95df94 h1:MK1cxaGYSQ5jGbaHNjTfNoJAsNz8THEAjF7LC0j8fo8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240201135447-eae57f95df94/go.mod h1:lIa/I88VNNubaYR3VFXNGVe9yc/GRcmhpECRX/6pgzA= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.6.0 h1:FEn6FjzynW4TIQo5G096Tr7xYK/P5LY9cSS6wRbXZTc= From 1cc18b0af598a8cf8489fa77d956d3d725a86927 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Thu, 1 Feb 2024 18:46:44 +0100 Subject: [PATCH 7/7] Remove workflow_dispatch (#12549) --- .github/workflows/update-dependabot-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update-dependabot-pr.yml b/.github/workflows/update-dependabot-pr.yml index 39ea7f42819..021ffabc5d2 100644 --- a/.github/workflows/update-dependabot-pr.yml +++ b/.github/workflows/update-dependabot-pr.yml @@ -4,7 +4,6 @@ name: update-dependabot-pr on: - workflow_dispatch: ~ # This gives us the ability to run it for existing PRs where dependabot has already created a PR push: branches: - dependabot/go_modules/**