From dffba83289ac0dab946eac43af07698866cb702c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 3 Nov 2023 13:38:16 +0100 Subject: [PATCH 01/32] chore: enable dependabot version updates of github-actions yaml files (#11992) --- .github/dependabot.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..be09f01d2be --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,42 @@ +version: 2 +updates: + + # GitHub actions + - package-ecosystem: "github-actions" + directory: "/" + reviewers: + - "elastic/observablt-ci" + schedule: + interval: "weekly" + day: "sunday" + time: "22:00" + groups: + github-actions: + patterns: + - "*" + + # GitHub composite actions + - package-ecosystem: "github-actions" + directory: "/.github/workflows/generate-smoke-tests-list" + schedule: + interval: "weekly" + day: "sunday" + time: "22:00" + reviewers: + - "elastic/observablt-ci" + groups: + github-actions: + patterns: + - "*" + - package-ecosystem: "github-actions" + directory: "/.github/workflows/setup-cluster-env" + schedule: + interval: "weekly" + day: "sunday" + time: "22:00" + reviewers: + - "elastic/observablt-ci" + groups: + github-actions: + patterns: + - "*" From 5c912df43b16c461bbb441dd1c94afdd49b2f7b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 15:27:18 +0100 Subject: [PATCH 02/32] build(deps): bump the github-actions group with 5 updates (#12000) Bumps the github-actions group with 5 updates: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `3` | `4` | | [actions/setup-go](https://github.com/actions/setup-go) | `3` | `4` | | [rlespinasse/github-slug-action](https://github.com/rlespinasse/github-slug-action) | `d1ca8ffbce40ea2371e35bca356db0acacf567d2` | `00d4236bb38fcea6fc4aa6b1dacc7187fc8e38a0` | | [hashicorp/vault-action](https://github.com/hashicorp/vault-action) | `2.6.0` | `2.7.4` | | [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) | `2` | `3` | Updates `actions/checkout` from 3 to 4 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) Updates `actions/setup-go` from 3 to 4 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v3...v4) Updates `rlespinasse/github-slug-action` from d1ca8ffbce40ea2371e35bca356db0acacf567d2 to 00d4236bb38fcea6fc4aa6b1dacc7187fc8e38a0 - [Release notes](https://github.com/rlespinasse/github-slug-action/releases) - [Commits](https://github.com/rlespinasse/github-slug-action/compare/d1ca8ffbce40ea2371e35bca356db0acacf567d2...00d4236bb38fcea6fc4aa6b1dacc7187fc8e38a0) Updates `hashicorp/vault-action` from 2.6.0 to 2.7.4 - [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.6.0...v2.7.4) Updates `hashicorp/setup-terraform` from 2 to 3 - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/setup-terraform/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: rlespinasse/github-slug-action dependency-type: direct:production dependency-group: github-actions - dependency-name: hashicorp/vault-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-major 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 | 8 ++++---- .github/workflows/bump-elastic-stack.yml | 2 +- .github/workflows/bump-golang.yml | 2 +- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/smoke-tests-schedule.yml | 2 +- .github/workflows/terraform-fmt.yml | 4 ++-- .github/workflows/update-beats.yml | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 01d6d721bc4..f49196bcd1e 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -44,13 +44,13 @@ jobs: TF_VAR_REPO: ${{ github.repository }} GOBENCH_TAGS: branch=${{ github.head_ref || github.ref }},commit=${{ github.sha }},target_branch=${{ github.base_ref }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: go-version-file: 'go.mod' - - uses: rlespinasse/github-slug-action@d1ca8ffbce40ea2371e35bca356db0acacf567d2 + - uses: rlespinasse/github-slug-action@00d4236bb38fcea6fc4aa6b1dacc7187fc8e38a0 - name: Set up env run: | @@ -67,7 +67,7 @@ jobs: echo "BENCHMARK_RUN=${{ inputs.benchmarkRun }}" >> "$GITHUB_ENV" fi - - uses: hashicorp/vault-action@v2.6.0 + - uses: hashicorp/vault-action@v2.7.4 env: AWS_CREDENTIALS_PATH: secret/observability-team/ci/elastic-observability-aws-account-auth BENCHMARK_CLOUD_CREDENTIALS_PATH: secret/observability-team/ci/benchmark-cloud @@ -97,7 +97,7 @@ jobs: url: ${{ secrets.VAULT_ADDR }} roleId: ${{ secrets.VAULT_ROLE_ID }} secretId: ${{ secrets.VAULT_SECRET_ID }} - - uses: hashicorp/setup-terraform@v2 + - uses: hashicorp/setup-terraform@v3 with: terraform_version: 1.3.7 terraform_wrapper: false diff --git a/.github/workflows/bump-elastic-stack.yml b/.github/workflows/bump-elastic-stack.yml index 426c7f635f4..6680ec511db 100644 --- a/.github/workflows/bump-elastic-stack.yml +++ b/.github/workflows/bump-elastic-stack.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.filter.outputs.matrix) }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml index c76efe51de9..da8e4009e6b 100644 --- a/.github/workflows/bump-golang.yml +++ b/.github/workflows/bump-golang.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current with: vaultUrl: ${{ secrets.VAULT_ADDR }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17e48009f48..d1eee923412 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true @@ -45,8 +45,8 @@ jobs: os: ['macos-latest', 'ubuntu-latest', 'windows-latest'] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true @@ -57,8 +57,8 @@ jobs: system-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: systemtest/go.mod cache: true diff --git a/.github/workflows/smoke-tests-schedule.yml b/.github/workflows/smoke-tests-schedule.yml index 02cacd9b60c..2ac98b2fddd 100644 --- a/.github/workflows/smoke-tests-schedule.yml +++ b/.github/workflows/smoke-tests-schedule.yml @@ -17,7 +17,7 @@ jobs: outputs: matrix: ${{ steps.generate.outputs.matrix }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - id: generate name: Generate matrix uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current diff --git a/.github/workflows/terraform-fmt.yml b/.github/workflows/terraform-fmt.yml index d0605b73bdf..23a3518b502 100644 --- a/.github/workflows/terraform-fmt.yml +++ b/.github/workflows/terraform-fmt.yml @@ -12,6 +12,6 @@ jobs: terraform-fmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: hashicorp/setup-terraform@v2 + - uses: actions/checkout@v4 + - uses: hashicorp/setup-terraform@v3 - run: terraform fmt -recursive -check -diff diff --git a/.github/workflows/update-beats.yml b/.github/workflows/update-beats.yml index ac5213772ec..31605a85463 100644 --- a/.github/workflows/update-beats.yml +++ b/.github/workflows/update-beats.yml @@ -25,8 +25,8 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.filter.outputs.matrix) }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current From 250036087209763bcb2e1172d44dfe7dba17c501 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 3 Nov 2023 11:22:30 -0400 Subject: [PATCH 03/32] chore: Update to elastic/beats@48e0660ff060 (#12003) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- 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 dd389790a11..18b4d470d60 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.20231101145342-57df903385a9 +Version: v7.0.0-alpha2.0.20231103045320-48e0660ff060 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231101145342-57df903385a9/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231103045320-48e0660ff060/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 b7005198969..8652aff7015 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.20231019084040-a0f7950e9775 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231101145342-57df903385a9 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231103045320-48e0660ff060 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index 656c8270b1c..cbfff0ed376 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.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231101145342-57df903385a9 h1:fCLFX9vD1V8JV0IfMApXcnhtAbYjB3Xy/xxdcClOjlA= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231101145342-57df903385a9/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231103045320-48e0660ff060 h1:CZq5v8GtaWyf7M0aKz9tPRCDoObcwuxAuWjEU+BeV08= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231103045320-48e0660ff060/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From c5d470a2aff54b4e0503a353b5aa349aa874dec4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:00:58 -0500 Subject: [PATCH 04/32] chore: Update to elastic/beats@0f8fc26ca766 (#12011) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- 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 18b4d470d60..3af5c341c31 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.20231103045320-48e0660ff060 +Version: v7.0.0-alpha2.0.20231106143635-0f8fc26ca766 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231103045320-48e0660ff060/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231106143635-0f8fc26ca766/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 8652aff7015..0b3dc106527 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.20231019084040-a0f7950e9775 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231103045320-48e0660ff060 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106143635-0f8fc26ca766 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index cbfff0ed376..3ffe5e588b8 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.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231103045320-48e0660ff060 h1:CZq5v8GtaWyf7M0aKz9tPRCDoObcwuxAuWjEU+BeV08= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231103045320-48e0660ff060/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106143635-0f8fc26ca766 h1:jFum9x+ZtPSRog/Y7Uw4nTMnuOl7da2PJE91FaeKRLY= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106143635-0f8fc26ca766/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From d06bf61b967d38e13aec67c3a5728af0a394ed6e Mon Sep 17 00:00:00 2001 From: Marc Lopez Rubio Date: Tue, 7 Nov 2023 12:45:40 +0800 Subject: [PATCH 05/32] smoke: Rename max_primary_shard_size to max_size (#12006) Updates the legacy smoke test ILM policy size field name. It appears to have changed recently from `max_primary_shard_size` to `max_size`. Signed-off-by: Marc Lopez Rubio --- testing/smoke/lib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/smoke/lib.sh b/testing/smoke/lib.sh index 3a3e8eff90c..0fe19a2d731 100644 --- a/testing/smoke/lib.sh +++ b/testing/smoke/lib.sh @@ -262,15 +262,15 @@ legacy_assert_ilm() { SUCCESS=false fi local ILM_HOT_PHASE=$(echo ${ILM_PHASES} | jq '.hot') - local ILM_HOT_PHASE_MAX_SIZE=$(echo ${ILM_HOT_PHASE} | jq -r '.actions.rollover.max_primary_shard_size') + local ILM_HOT_PHASE_MAX_SIZE=$(echo ${ILM_HOT_PHASE} | jq -r '.actions.rollover.max_size') local ILM_HOT_PHASE_MAX_AGE=$(echo ${ILM_HOT_PHASE} | jq -r '.actions.rollover.max_age') if [[ "${ILM_HOT_PHASE_MAX_SIZE}" != "${EXPECTED_MAX_SIZE}" ]]; then - echo "-> Invalid ILM policy ${LEGACY_ILM_POLICY}; expected hot phase max_primary_shard_size ${EXPECTED_MAX_SIZE} got ${ILM_HOT_PHASE_MAX_SIZE}" + echo "-> Invalid ILM policy \"${LEGACY_ILM_POLICY}\"; expected hot phase \"max_age\" ${EXPECTED_MAX_SIZE} got ${ILM_HOT_PHASE_MAX_SIZE}" echo "${ILM_HOT_PHASE}" SUCCESS=false fi if [[ "${ILM_HOT_PHASE_MAX_AGE}" != "${EXPECTED_MAX_AGE}" ]]; then - echo "-> Invalid ILM policy ${LEGACY_ILM_POLICY}; expected hot phase max_age ${EXPECTED_MAX_AGE} got ${ILM_HOT_PHASE_MAX_AGE}" + echo "-> Invalid ILM policy \"${LEGACY_ILM_POLICY}\"; expected hot phase \"max_age\" ${EXPECTED_MAX_AGE} got ${ILM_HOT_PHASE_MAX_AGE}" echo "${ILM_HOT_PHASE}" SUCCESS=false fi From 6174ffdf62e89de83abca1e847c85ad82ec64e5d Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Tue, 7 Nov 2023 11:38:58 -0600 Subject: [PATCH 06/32] docs: Remove references to `processor.event` (#12013) * remove references to processor.{event,type} * add item to changelog --- changelogs/8.10.asciidoc | 1 + docs/configure/outputs/logstash.asciidoc | 4 ++-- docs/data-model.asciidoc | 4 +--- docs/otel-metrics.asciidoc | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/changelogs/8.10.asciidoc b/changelogs/8.10.asciidoc index e7382633e71..574c859d40f 100644 --- a/changelogs/8.10.asciidoc +++ b/changelogs/8.10.asciidoc @@ -47,6 +47,7 @@ Fix tail-based sampling discarding low throughput and low sample rate traces {pu - Aggregated metrics now consider global labels to be part of a service's identity, and high cardinality global labels may cause services to be obscured {pull}11386[11386] - Event protobuf encoding for tail-based sampling changed (to a more efficient encoding) for event timestamp and duration {pull}11386[11386] - Use object notation for data_stream fields {pull}11311[11311] +- Removed `processor.event` and `processor.name` from the data model {pull}11028[11028] [float] ==== Bug fixes diff --git a/docs/configure/outputs/logstash.asciidoc b/docs/configure/outputs/logstash.asciidoc index ac52c93fe21..e81df687143 100644 --- a/docs/configure/outputs/logstash.asciidoc +++ b/docs/configure/outputs/logstash.asciidoc @@ -184,7 +184,7 @@ APM Server sends the following `@metadata` to {ls}: <2> The current version of APM Server. In addition to `@metadata`, APM Server provides other potentially useful fields, like the -`processor.event` field and `data_stream` fields, which can be used to conditionally operate on +`data_stream` field, which can be used to conditionally operate on {apm-guide-ref}/data-model.html[event types], namespaces, or datasets. As an example, you might want to use {ls} to route all `metric` events to the same custom metrics data stream, @@ -194,7 +194,7 @@ rather than to service-specific data streams: ---- output { if [@metadata][beat] == "apm-server" { <1> - if [processor][event] == "metric" { <2> + if [data_stream][type] == "metrics" { <2> elasticsearch { index => "%{[data_stream][type]}-custom-%{[data_stream][namespace]}" <3> action => "create" <4> diff --git a/docs/data-model.asciidoc b/docs/data-model.asciidoc index 5e6f3ad9724..20e0af115df 100644 --- a/docs/data-model.asciidoc +++ b/docs/data-model.asciidoc @@ -236,9 +236,7 @@ and {apm-go-ref-v}/metrics.html[Go runtime] metrics in the Go Agent. Infrastructure and application metrics are important sources of information when debugging production systems, which is why we've made it easy to filter metrics for specific hosts or containers in the {kib} {kibana-ref}/metrics.html[metrics overview]. -Metrics have the `processor.event` property set to `metric`. - -TIP: Most agents limit keyword fields (e.g. `processor.event`) to 1024 characters, +TIP: Most agents limit keyword fields to 1024 characters, non-keyword fields (e.g. `system.memory.total`) to 10,000 characters. Metrics are stored in metric indices. diff --git a/docs/otel-metrics.asciidoc b/docs/otel-metrics.asciidoc index b50588a4085..27fad8d0703 100644 --- a/docs/otel-metrics.asciidoc +++ b/docs/otel-metrics.asciidoc @@ -38,7 +38,7 @@ include::{tab-widget-dir}/open-kibana-widget.asciidoc[] . Open the main menu, then click *Discover*. . Select `apm-*` as your index pattern. -. Filter the data to only show documents with metrics: `processor.event: "metric"` +. Filter the data to only show documents with metrics: `[data_stream][type]: "metrics"` . Narrow your search with a known OpenTelemetry field. For example, if you have an `order_value` field, add `order_value: *` to your search to return only OpenTelemetry metrics documents. From 0af3a19dd98ab51748c94deb8383f952ec68bd40 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 7 Nov 2023 12:59:51 -0500 Subject: [PATCH 07/32] chore: Update to elastic/beats@475eaf5784b4 (#12018) 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 3af5c341c31..1e58aa139e7 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.20231106143635-0f8fc26ca766 +Version: v7.0.0-alpha2.0.20231106191710-475eaf5784b4 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231106143635-0f8fc26ca766/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231106191710-475eaf5784b4/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 0b3dc106527..f17917284c6 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.20231019084040-a0f7950e9775 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106143635-0f8fc26ca766 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index 3ffe5e588b8..1ff410998c3 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.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106143635-0f8fc26ca766 h1:jFum9x+ZtPSRog/Y7Uw4nTMnuOl7da2PJE91FaeKRLY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106143635-0f8fc26ca766/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4 h1:YfjFpr3qO9mBhNyiWmt+04biFXvT4nHcFnx0G5P50Dc= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From c2e047f230091fa6699587eaf296c9d31c997af4 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Tue, 7 Nov 2023 20:32:12 +0200 Subject: [PATCH 08/32] Update shared-docker.asciidoc (#12014) Update base image reference in docs --- docs/shared-docker.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/shared-docker.asciidoc b/docs/shared-docker.asciidoc index f783b5ef108..1d34e5dbd70 100644 --- a/docs/shared-docker.asciidoc +++ b/docs/shared-docker.asciidoc @@ -2,7 +2,7 @@ ==== Run {beatname_uc} on Docker Docker images for {beatname_uc} are available from the Elastic Docker -registry. The base image is https://hub.docker.com/_/centos/[centos:7]. +registry. The base image is https://hub.docker.com/_/ubuntu[ubuntu:20.04]. A list of all published Docker images and tags is available at https://www.docker.elastic.co[www.docker.elastic.co]. From a88fd41b6fe4ac4c5eab8ed8f7af9ac9fe4e7035 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 8 Nov 2023 04:26:46 +0800 Subject: [PATCH 09/32] docs: Update base image to 22.04 (#12026) Base image changed since #11778. Update docs accordingly. --- docs/shared-docker.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/shared-docker.asciidoc b/docs/shared-docker.asciidoc index 1d34e5dbd70..79451dba14d 100644 --- a/docs/shared-docker.asciidoc +++ b/docs/shared-docker.asciidoc @@ -2,7 +2,7 @@ ==== Run {beatname_uc} on Docker Docker images for {beatname_uc} are available from the Elastic Docker -registry. The base image is https://hub.docker.com/_/ubuntu[ubuntu:20.04]. +registry. The base image is https://hub.docker.com/_/ubuntu[ubuntu:22.04]. A list of all published Docker images and tags is available at https://www.docker.elastic.co[www.docker.elastic.co]. From bd2a453b75372b219b820c3fd7b0b122db965c14 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:55:19 +0100 Subject: [PATCH 10/32] test: use more stable ip in otlp grpc logs ip system test (#12037) --- .../TestOTLPGRPCLogsClientIP.approved.json | 13 +++++-------- systemtest/otlp_test.go | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json index ef73e0dc062..0b741587562 100644 --- a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json @@ -8,18 +8,15 @@ }, "client": { "geo": { - "city_name": "dynamic", "continent_name": "Europe", - "country_iso_code": "ES", - "country_name": "Spain", + "country_iso_code": "DE", + "country_name": "Germany", "location": { "lat": "dynamic", "lon": "dynamic" - }, - "region_iso_code": "dynamic", - "region_name": "dynamic" + } }, - "ip": "195.55.79.118" + "ip": "178.162.206.244" }, "data_stream": { "dataset": "apm.app.unknown", @@ -51,7 +48,7 @@ "name": "unknown" }, "source": { - "ip": "195.55.79.118", + "ip": "178.162.206.244", "nat": { "ip": "127.0.0.1" } diff --git a/systemtest/otlp_test.go b/systemtest/otlp_test.go index 9122c2d6e10..6a692eba1ed 100644 --- a/systemtest/otlp_test.go +++ b/systemtest/otlp_test.go @@ -464,7 +464,7 @@ func TestOTLPGRPCLogsClientIP(t *testing.T) { defer cancel() // Override local IP address to be found in "GeoLite2-City.mmdb". - md := metadata.New(map[string]string{"X-Forwarded-For": "195.55.79.118"}) + md := metadata.New(map[string]string{"X-Forwarded-For": "178.162.206.244"}) ctx = metadata.NewOutgoingContext(ctx, md) conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock(), grpc.WithDefaultCallOptions(grpc.UseCompressor("gzip"))) @@ -478,7 +478,7 @@ func TestOTLPGRPCLogsClientIP(t *testing.T) { require.NoError(t, err) result := estest.ExpectDocs(t, systemtest.Elasticsearch, "logs-apm*", nil) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.city_name", "client.geo.location.lat", "client.geo.location.lon", "client.geo.region_iso_code", "client.geo.region_name") + approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.location.lat", "client.geo.location.lon") } func newMobileLogs(body interface{}) plog.Logs { From ec25d36779ee014e04e4aabd3abc32b3098ff55c Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:08:38 -0500 Subject: [PATCH 11/32] [updatecli] Update to elastic/beats@9f93f932e9ae (#12030) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@28152d53e32b Made with ❤️️ by updatecli * chore: Update to elastic/beats@89d8e71f9a3c Made with ❤️️ by updatecli * chore: Update to elastic/beats@62eb8eb0e2d0 Made with ❤️️ by updatecli * chore: Update to elastic/beats@9f93f932e9ae 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 1e58aa139e7..1c1c165226a 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.20231106191710-475eaf5784b4 +Version: v7.0.0-alpha2.0.20231113120716-9f93f932e9ae Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231106191710-475eaf5784b4/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231113120716-9f93f932e9ae/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 f17917284c6..8b808820ad9 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.20231019084040-a0f7950e9775 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index 1ff410998c3..828fdc9c1fb 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.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4 h1:YfjFpr3qO9mBhNyiWmt+04biFXvT4nHcFnx0G5P50Dc= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231106191710-475eaf5784b4/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae h1:UHHEEnVslbc0XXkU79JVTAkVHo6vJkKMqby4Sh93mmU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From 3889c0e5a665d66b01f17630e65967b77c564d85 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:32:20 -0500 Subject: [PATCH 12/32] [updatecli] Bump elastic stack version to 8.12.0-9a986274 (#12028) 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 * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * 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 c6cb4bba8f8..cec367133cc 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.12.0-0fcb9daf-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-9a986274-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-0fcb9daf-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.12.0-9a986274-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-0fcb9daf-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.12.0-9a986274-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 264a132b3a9..c3098100bfa 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.12.0-0fcb9daf-SNAPSHOT + version: 8.12.0-9a986274-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index c91372a1229..38a25d6577e 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.12.0-0fcb9daf-SNAPSHOT + version: 8.12.0-9a986274-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 99c906e1571..9c113b7dc6d 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.12.0-0fcb9daf-SNAPSHOT + version: 8.12.0-9a986274-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From bbe53622449c6dcf395c2595b842a5ab3863a1b0 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:38:13 -0500 Subject: [PATCH 13/32] [updatecli] Bump Golang version to 1.21.4 (#12036) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update Dockerfile with Golang version 1.21.4 Made with ❤️️ by updatecli * chore: Update version.asciidoc with Golang version 1.21.4 Made with ❤️️ by updatecli * chore: Update .go-version with Golang version 1.21.4 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- .go-version | 2 +- docs/version.asciidoc | 2 +- packaging/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.go-version b/.go-version index bae5c7f667c..20a1265cf39 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.3 +1.21.4 diff --git a/docs/version.asciidoc b/docs/version.asciidoc index ee00b85c6b3..5f7517f251e 100644 --- a/docs/version.asciidoc +++ b/docs/version.asciidoc @@ -1,6 +1,6 @@ // doc-branch can be: master, 8.0, 8.1, etc. :doc-branch: master -:go-version: 1.21.3 +:go-version: 1.21.4 :python: 3.7 :docker: 1.12 :docker-compose: 1.11 diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index b0d0385a987..b9f9a09c165 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:22.04 # Build the apm-server binary. The golang image version is kept # up to date with go.mod by Makefile. -FROM golang:1.21.3 as builder +FROM golang:1.21.4 as builder WORKDIR /src COPY go.mod go.sum /src/ COPY internal/glog/go.mod /src/internal/glog/go.mod From 1fbf9dd128fc4540618ec42a4bdac3bbf037fb68 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 13 Nov 2023 17:15:23 -0800 Subject: [PATCH 14/32] Update 8.11.asciidoc (#12046) --- changelogs/8.11.asciidoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelogs/8.11.asciidoc b/changelogs/8.11.asciidoc index 06cf6a43eae..e1f4696b4b3 100644 --- a/changelogs/8.11.asciidoc +++ b/changelogs/8.11.asciidoc @@ -3,8 +3,17 @@ https://github.com/elastic/apm-server/compare/8.10\...8.11[View commits] +* <> * <> +[float] +[[release-notes-8.11.1]] +=== APM version 8.11.1 + +https://github.com/elastic/apm-server/compare/v8.11.0\...v8.11.1[View commits] + +No significant changes. + [float] [[release-notes-8.11.0]] === APM version 8.11.0 From 3d190b4cca32ec3da26dd8b4fd34548a7d10b012 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 14 Nov 2023 09:28:41 +0100 Subject: [PATCH 15/32] ubi: remove major version (#11977) to help with the Unified Release contract --- packaging.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging.mk b/packaging.mk index 36afe0b0f0d..5a72f414f27 100644 --- a/packaging.mk +++ b/packaging.mk @@ -28,13 +28,13 @@ DOCKER_BUILD_ARGS := \ DOCKER_IMAGES := \ build/docker/apm-server-$(APM_SERVER_VERSION).txt \ build/docker/apm-server-$(APM_SERVER_VERSION)-SNAPSHOT.txt \ - build/docker/apm-server-ubi9-$(APM_SERVER_VERSION).txt \ - build/docker/apm-server-ubi9-$(APM_SERVER_VERSION)-SNAPSHOT.txt + build/docker/apm-server-ubi-$(APM_SERVER_VERSION).txt \ + build/docker/apm-server-ubi-$(APM_SERVER_VERSION)-SNAPSHOT.txt build/docker/%.txt: DOCKER_IMAGE_TAG := docker.elastic.co/apm/apm-server:% build/docker/%.txt: VERSION := $(APM_SERVER_VERSION) build/docker/%-SNAPSHOT.txt: VERSION := $(APM_SERVER_VERSION)-SNAPSHOT -build/docker/apm-server-ubi9-%.txt: DOCKER_BUILD_ARGS+=--build-arg BASE_IMAGE=docker.elastic.co/ubi9/ubi-minimal +build/docker/apm-server-ubi-%.txt: DOCKER_BUILD_ARGS+=--build-arg BASE_IMAGE=docker.elastic.co/ubi9/ubi-minimal .PHONY: $(DOCKER_IMAGES) $(DOCKER_IMAGES): @@ -43,7 +43,7 @@ $(DOCKER_IMAGES): # Docker image tarballs. We distribute UBI8 Docker images only for AMD64. DOCKER_IMAGE_SUFFIX := docker-image$(if $(findstring arm64,$(GOARCH)),-arm64).tar.gz -DOCKER_IMAGE_PREFIXES := apm-server $(if $(findstring amd64,$(GOARCH)), apm-server-ubi9) +DOCKER_IMAGE_PREFIXES := apm-server $(if $(findstring amd64,$(GOARCH)), apm-server-ubi) DOCKER_IMAGE_RELEASE_TARBALLS := $(patsubst %, $(DISTDIR)/%-$(APM_SERVER_VERSION)-$(DOCKER_IMAGE_SUFFIX), $(DOCKER_IMAGE_PREFIXES)) DOCKER_IMAGE_SNAPSHOT_TARBALLS := $(patsubst %, $(DISTDIR)/%-$(APM_SERVER_VERSION)-SNAPSHOT-$(DOCKER_IMAGE_SUFFIX), $(DOCKER_IMAGE_PREFIXES)) From 4e85a58ec234bbdb639c7f8bc03150cdf0bb30d4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 15 Nov 2023 07:31:38 -0500 Subject: [PATCH 16/32] chore: Update to elastic/beats@921dedec8f7d (#12050) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- 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 1c1c165226a..87bbc9b6813 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.20231113120716-9f93f932e9ae +Version: v7.0.0-alpha2.0.20231114075900-921dedec8f7d Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231113120716-9f93f932e9ae/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231114075900-921dedec8f7d/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 8b808820ad9..607c44d3943 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.20231019084040-a0f7950e9775 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231114075900-921dedec8f7d github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index 828fdc9c1fb..4ac15b4c0c0 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.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae h1:UHHEEnVslbc0XXkU79JVTAkVHo6vJkKMqby4Sh93mmU= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231113120716-9f93f932e9ae/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231114075900-921dedec8f7d h1:Dm9p0e3ParuCHWDr6jlmmuDRQJJFO0eRdwaBm8QaQV8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231114075900-921dedec8f7d/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From e2734a2c100e50ef17604bb219f5a952a28feeda Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:53:14 -0500 Subject: [PATCH 17/32] [updatecli] Bump elastic stack version to 8.12.0-82c28a25 (#12049) 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 * 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 cec367133cc..85240dc2a04 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.12.0-9a986274-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-82c28a25-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-9a986274-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.12.0-82c28a25-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-9a986274-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.12.0-82c28a25-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 c3098100bfa..8b4dc72d862 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.12.0-9a986274-SNAPSHOT + version: 8.12.0-82c28a25-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 38a25d6577e..658091569b0 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.12.0-9a986274-SNAPSHOT + version: 8.12.0-82c28a25-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 9c113b7dc6d..9fad34a4579 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.12.0-9a986274-SNAPSHOT + version: 8.12.0-82c28a25-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 6fdc1d08092133db5d510da58016b050e4fd3f23 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:10:28 -0500 Subject: [PATCH 18/32] chore: Update to elastic/beats@0f656292d196 (#12056) 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 87bbc9b6813..c5259fb097d 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.20231114075900-921dedec8f7d +Version: v7.0.0-alpha2.0.20231115142753-0f656292d196 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231114075900-921dedec8f7d/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231115142753-0f656292d196/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 607c44d3943..56dc0dc03d0 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.20231019084040-a0f7950e9775 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231114075900-921dedec8f7d + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index 4ac15b4c0c0..11513434ad2 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.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231114075900-921dedec8f7d h1:Dm9p0e3ParuCHWDr6jlmmuDRQJJFO0eRdwaBm8QaQV8= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231114075900-921dedec8f7d/go.mod h1:lHmvjDNRv+ZZUW1j0OnvunpHDG77jP//HAz70s/B1wI= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 h1:TVYeKGZK8p987p5gxukuVFzhFi3r3ZODehgpex79CJ0= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From 763ed5ffd17335202c091a3fd13cbad95d48fdcb Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:36:11 +0100 Subject: [PATCH 19/32] perf: set max conns idle per host as docappender max request (#12035) * perf: set max conns idle per host as docappender max request By default the http transport will use 2 as the max idle connections per host. The docappender client will send request a single host and will have at most MaxRequest appenders sharing the same client. To improve performance and connection reuse we set the number of max idle conns per host to MaxRequest * fix: use default value of 10 sync default value with docappender default * fix: only overwrite maxidleconnsperhost if maxrequests is not zero * fix: set max idle conns per host before creating the es client --------- Co-authored-by: Silvia Mitter --- internal/beater/beater.go | 5 ++++ internal/elasticsearch/config.go | 34 ++++++++++++++------------- internal/elasticsearch/config_test.go | 9 +++---- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/internal/beater/beater.go b/internal/beater/beater.go index f6c7f5e4d53..aee736e3fa1 100644 --- a/internal/beater/beater.go +++ b/internal/beater/beater.go @@ -700,10 +700,15 @@ func (s *Runner) newFinalBatchProcessor( } esConfig.FlushInterval = time.Second esConfig.Config = elasticsearch.DefaultConfig() + esConfig.MaxIdleConnsPerHost = 10 if err := s.elasticsearchOutputConfig.Unpack(&esConfig); err != nil { return nil, nil, err } + if esConfig.MaxRequests != 0 { + esConfig.MaxIdleConnsPerHost = esConfig.MaxRequests + } + var flushBytes int if esConfig.FlushBytes != "" { b, err := humanize.ParseBytes(esConfig.FlushBytes) diff --git a/internal/elasticsearch/config.go b/internal/elasticsearch/config.go index 3c493e75a20..8b9e6a423eb 100644 --- a/internal/elasticsearch/config.go +++ b/internal/elasticsearch/config.go @@ -44,18 +44,19 @@ var ( // Config holds all configurable fields that are used to create a Client type Config struct { - Hosts Hosts `config:"hosts" validate:"required"` - Protocol string `config:"protocol"` - Path string `config:"path"` - ProxyURL string `config:"proxy_url"` - ProxyDisable bool `config:"proxy_disable"` - Timeout time.Duration `config:"timeout"` - TLS *tlscommon.Config `config:"ssl"` - Username string `config:"username"` - Password string `config:"password"` - APIKey string `config:"api_key"` - Headers map[string]string `config:"headers"` - MaxRetries int `config:"max_retries"` + Hosts Hosts `config:"hosts" validate:"required"` + Protocol string `config:"protocol"` + Path string `config:"path"` + ProxyURL string `config:"proxy_url"` + ProxyDisable bool `config:"proxy_disable"` + Timeout time.Duration `config:"timeout"` + TLS *tlscommon.Config `config:"ssl"` + Username string `config:"username"` + Password string `config:"password"` + APIKey string `config:"api_key"` + Headers map[string]string `config:"headers"` + MaxRetries int `config:"max_retries"` + MaxIdleConnsPerHost int `config:",ignore"` // CompressionLevel holds the gzip compression level used when bulk indexing // with go-docappender; it is otherwise ignored. @@ -145,9 +146,10 @@ func NewHTTPTransport(cfg *Config) (*http.Transport, error) { dialer := transport.NetDialer(cfg.Timeout) tlsDialer := transport.TLSDialer(dialer, tlsConfig, cfg.Timeout) return &http.Transport{ - Proxy: proxy, - Dial: dialer.Dial, - DialTLS: tlsDialer.Dial, - TLSClientConfig: tlsConfig.ToConfig(), + Proxy: proxy, + Dial: dialer.Dial, + DialTLS: tlsDialer.Dial, + TLSClientConfig: tlsConfig.ToConfig(), + MaxIdleConnsPerHost: cfg.MaxIdleConnsPerHost, }, nil } diff --git a/internal/elasticsearch/config_test.go b/internal/elasticsearch/config_test.go index 2676d31a6b9..3593bf02336 100644 --- a/internal/elasticsearch/config_test.go +++ b/internal/elasticsearch/config_test.go @@ -146,10 +146,11 @@ func TestBeatsConfigSynced(t *testing.T) { // TODO(simitt): take a closer look at ES ouput changes in libbeat // introduced with https://github.com/elastic/beats/pull/25219 localStructExceptions := map[string]interface{}{ - "ssl": nil, - "timeout": nil, - "proxy_disable": nil, - "proxy_url": nil, + "ssl": nil, + "timeout": nil, + "proxy_disable": nil, + "proxy_url": nil, + "maxidleconnsperhost": nil, } for name, localStructField := range localStructFields { if _, ok := localStructExceptions[name]; ok { From 9029f16c9446e25ce0ca40a061416689caf12fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar?= <56847527+LikeTheSalad@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:53:46 +0100 Subject: [PATCH 20/32] Setting event timestamp from OTel observed timestamp (#11935) * Upgrading apm-data version * Updating NOTICE.txt * Updating changelog * Updating changelog * Upgrading apm-data * Upgrading apm-data * fmt update * Upgrading apm-data * Upgrading apm-data --------- Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 4 ++-- changelogs/head.asciidoc | 1 + go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index c5259fb097d..e9d1b9dc93c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -362,11 +362,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-data -Version: v0.1.1-0.20231019084040-a0f7950e9775 +Version: v0.1.1-0.20231019120308-82201b991ae5 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1-0.20231019084040-a0f7950e9775/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1-0.20231019120308-82201b991ae5/LICENSE: Apache License Version 2.0, January 2004 diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 9652643289c..5e6155333cf 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -20,3 +20,4 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits] ==== Added - Update container base image to Ubuntu 22.04 {pull}11778[11778] - Add support for returning partial success response in OTLP input {pull}11883[11883] +- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935] \ No newline at end of file diff --git a/go.mod b/go.mod index 56dc0dc03d0..12db89a67f1 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b 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.20231019084040-a0f7950e9775 + github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 diff --git a/go.sum b/go.sum index 11513434ad2..127650ef6c5 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HEE0a5BDFmhEmJV/Uo4uzj/paHjd7yl6+KYguw= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= -github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= -github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= +github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= +github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 h1:TVYeKGZK8p987p5gxukuVFzhFi3r3ZODehgpex79CJ0= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= From 877f52e8ba09e32c4584e843cf59b1140f4ef255 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:22:30 -0500 Subject: [PATCH 21/32] [updatecli] Bump elastic stack version to 8.12.0-c18d0d89 (#12060) 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 --- 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 85240dc2a04..714e376def3 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.12.0-82c28a25-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-c18d0d89-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-82c28a25-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.12.0-c18d0d89-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-82c28a25-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.12.0-c18d0d89-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 8b4dc72d862..7028abf83a7 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.12.0-82c28a25-SNAPSHOT + version: 8.12.0-c18d0d89-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 658091569b0..1cd82244c1b 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.12.0-82c28a25-SNAPSHOT + version: 8.12.0-c18d0d89-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 9fad34a4579..13107af5d69 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.12.0-82c28a25-SNAPSHOT + version: 8.12.0-c18d0d89-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 3e5fd9fbd67f4256cc614874506491114421c9ae Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:40:23 -0500 Subject: [PATCH 22/32] chore: Update to elastic/beats@23fc9409c3e3 (#12063) 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 e9d1b9dc93c..3739a9c459f 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.20231115142753-0f656292d196 +Version: v7.0.0-alpha2.0.20231115194952-23fc9409c3e3 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231115142753-0f656292d196/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231115194952-23fc9409c3e3/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 12db89a67f1..1fb93a5cf5a 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.20231019120308-82201b991ae5 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115194952-23fc9409c3e3 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index 127650ef6c5..399c3a1dd39 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.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 h1:TVYeKGZK8p987p5gxukuVFzhFi3r3ZODehgpex79CJ0= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115194952-23fc9409c3e3 h1:X4pq7zfQpPylaSUv+wcHWr9bKw/IaXNijKpQ+qz1hQ4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115194952-23fc9409c3e3/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From 92a82d311134602ec0f6f2400f711ed914cf4966 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:30:06 -0500 Subject: [PATCH 23/32] chore: Update to elastic/beats@c686ca76cc2e (#12070) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- 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 3739a9c459f..162b71682ce 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.20231115194952-23fc9409c3e3 +Version: v7.0.0-alpha2.0.20231116173409-c686ca76cc2e Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231115194952-23fc9409c3e3/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231116173409-c686ca76cc2e/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 1fb93a5cf5a..d0d700103e2 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.20231019120308-82201b991ae5 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115194952-23fc9409c3e3 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231116173409-c686ca76cc2e github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.7.0 diff --git a/go.sum b/go.sum index 399c3a1dd39..1dfde7109db 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.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115194952-23fc9409c3e3 h1:X4pq7zfQpPylaSUv+wcHWr9bKw/IaXNijKpQ+qz1hQ4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115194952-23fc9409c3e3/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231116173409-c686ca76cc2e h1:Q4iO3lER1OMiIXQFc48qMfACF5sqiee9dfFSZZ1HlHY= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231116173409-c686ca76cc2e/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From aaf05092d912136e84129749021dbdc1d7b63c78 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:47:02 -0500 Subject: [PATCH 24/32] [updatecli] Bump elastic stack version to 8.12.0-35e3b343 (#12068) 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 714e376def3..fc0d76886dc 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.12.0-c18d0d89-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-35e3b343-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-c18d0d89-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.12.0-35e3b343-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-c18d0d89-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.12.0-35e3b343-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 7028abf83a7..0df575182b6 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.12.0-c18d0d89-SNAPSHOT + version: 8.12.0-35e3b343-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 1cd82244c1b..4efb229a895 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.12.0-c18d0d89-SNAPSHOT + version: 8.12.0-35e3b343-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 13107af5d69..34677f8ec67 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.12.0-c18d0d89-SNAPSHOT + version: 8.12.0-35e3b343-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From f355f29682b626445ae428c9b23114191ce51ecd Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 20 Nov 2023 13:56:37 +0100 Subject: [PATCH 25/32] buildkite: notify the robots team if any failures too (#12074) --- .buildkite/package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/package.yml b/.buildkite/package.yml index e0405b2ef7f..ab7c500adb7 100644 --- a/.buildkite/package.yml +++ b/.buildkite/package.yml @@ -1,6 +1,8 @@ notify: - slack: "#apm-server" if: build.state == "failed" + - slack: "#observablt-bots" + if: "build.state != 'passed'" env: IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2004" From dce01232d8bea86017a257ecb8143f28fc3d369b Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:23:54 -0500 Subject: [PATCH 26/32] [updatecli] Bump elastic stack version to 8.12.0-7521d760 (#12080) 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 --- 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 fc0d76886dc..851f2b786e9 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.12.0-35e3b343-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-7521d760-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-35e3b343-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.12.0-7521d760-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-35e3b343-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.12.0-7521d760-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 0df575182b6..25d61694ea0 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.12.0-35e3b343-SNAPSHOT + version: 8.12.0-7521d760-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 4efb229a895..a9bbf2cee2c 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.12.0-35e3b343-SNAPSHOT + version: 8.12.0-7521d760-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 34677f8ec67..054b634c1a4 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.12.0-35e3b343-SNAPSHOT + version: 8.12.0-7521d760-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From f6a3cc03fc6b4782e1e1edbd8d63f1c3117dc049 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 21 Nov 2023 09:44:23 +0100 Subject: [PATCH 27/32] ironbank: use ubi:9.3 (#12077) --- packaging/ironbank/Dockerfile | 2 +- packaging/ironbank/hardening_manifest.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/ironbank/Dockerfile b/packaging/ironbank/Dockerfile index 16fd92374ba..ad597e69fe0 100644 --- a/packaging/ironbank/Dockerfile +++ b/packaging/ironbank/Dockerfile @@ -4,7 +4,7 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=redhat/ubi/ubi9 -ARG BASE_TAG=9.2 +ARG BASE_TAG=9.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files diff --git a/packaging/ironbank/hardening_manifest.yaml b/packaging/ironbank/hardening_manifest.yaml index 427862d8a81..d456b73c335 100644 --- a/packaging/ironbank/hardening_manifest.yaml +++ b/packaging/ironbank/hardening_manifest.yaml @@ -14,7 +14,7 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi9" - BASE_TAG: "9.2" + BASE_TAG: "9.3" ELASTIC_STACK: "${APM_SERVER_VERSION}" ELASTIC_PRODUCT: "apm-server" From 60308360701fffeb1b290ff798fe8ccde8aa51ab Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 21 Nov 2023 04:07:54 -0500 Subject: [PATCH 28/32] chore: Update to elastic/beats@3a79899c43d0 (#12081) 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 | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 162b71682ce..85f02059dba 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.20231116173409-c686ca76cc2e +Version: v7.0.0-alpha2.0.20231120144902-3a79899c43d0 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231116173409-c686ca76cc2e/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231120144902-3a79899c43d0/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 @@ -1040,11 +1040,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.7.0 +Version: v0.8.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.7.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.8.1/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index d0d700103e2..18000c46466 100644 --- a/go.mod +++ b/go.mod @@ -10,10 +10,10 @@ 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.20231019120308-82201b991ae5 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231116173409-c686ca76cc2e + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231120144902-3a79899c43d0 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 - github.com/elastic/elastic-agent-system-metrics v0.7.0 + github.com/elastic/elastic-agent-system-metrics v0.8.1 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v0.2.1-0.20230829163624-c69a1cf8ce35 github.com/elastic/go-elasticsearch/v8 v8.10.0 diff --git a/go.sum b/go.sum index 1dfde7109db..50633631fdd 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.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231116173409-c686ca76cc2e h1:Q4iO3lER1OMiIXQFc48qMfACF5sqiee9dfFSZZ1HlHY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231116173409-c686ca76cc2e/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231120144902-3a79899c43d0 h1:86HhScVfk7ApkB1dssCL9maYHz0EzDFEn0G1omwgbW8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231120144902-3a79899c43d0/go.mod h1:eIy7raRUU0xxzyz5Kz6CWyeed8l7L0TYdHxXwsJKzT8= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= @@ -144,8 +144,8 @@ github.com/elastic/elastic-agent-libs v0.6.2 h1:tE5pFK4y7xm1FtXm+r+63G7STjJAaWh3 github.com/elastic/elastic-agent-libs v0.6.2/go.mod h1:o+EySawBZGeYu49shJxerg2wRCimS1dhrD4As0MS700= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= -github.com/elastic/elastic-agent-system-metrics v0.7.0 h1:qDLY30UDforSd/TfHfqUDiiHSL6Nu6qLXHsKSxz4OuQ= -github.com/elastic/elastic-agent-system-metrics v0.7.0/go.mod h1:9C1UEfj0P687HAzZepHszN6zXA+2tN2Lx3Osvq1zby8= +github.com/elastic/elastic-agent-system-metrics v0.8.1 h1:eg6actuLeGJlIJFotHRdlAsz/3WhX2G8E0qI301IKBA= +github.com/elastic/elastic-agent-system-metrics v0.8.1/go.mod h1:9C1UEfj0P687HAzZepHszN6zXA+2tN2Lx3Osvq1zby8= github.com/elastic/elastic-transport-go/v8 v8.0.0-20230329154755-1a3c63de0db6/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= github.com/elastic/elastic-transport-go/v8 v8.3.0 h1:DJGxovyQLXGr62e9nDMPSxRyWION0Bh6d9eCFBriiHo= github.com/elastic/elastic-transport-go/v8 v8.3.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= From 0464f1d0f1178bcc4f1696123dccb7044891cde5 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 21 Nov 2023 13:27:27 +0100 Subject: [PATCH 29/32] chore: add APM Server in the slack message (#12085) --- .github/workflows/benchmarks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index f49196bcd1e..6a8055f63cc 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -166,7 +166,7 @@ jobs: uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current with: message: | - Nightly benchmarks failed! SDH Duty assignee, please have a look and follow this ! + Nightly APM Server benchmarks failed! SDH Duty assignee, please have a look and follow this ! vaultUrl: ${{ secrets.VAULT_ADDR }} vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} @@ -187,7 +187,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "${{ github.event_name == 'schedule' && 'Nightly succesfully executed!' || 'Benchmarks succesfully executed!' }}" + "text": "${{ github.event_name == 'schedule' && 'Nightly' || '' }} APM Server benchmarks succesfully executed!" }, "accessory": { "type": "button", From 87d312ac6cd4708d5dfdcf126117d7be82424b89 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:23:39 -0500 Subject: [PATCH 30/32] chore: Update to elastic/beats@886d078ba1f0 (#12091) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- 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 85f02059dba..e4ed62b5f71 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.20231120144902-3a79899c43d0 +Version: v7.0.0-alpha2.0.20231121082709-886d078ba1f0 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231120144902-3a79899c43d0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231121082709-886d078ba1f0/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 18000c46466..27b519300e7 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.20231019120308-82201b991ae5 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231120144902-3a79899c43d0 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231121082709-886d078ba1f0 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.8.1 diff --git a/go.sum b/go.sum index 50633631fdd..aefe06004c2 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.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231120144902-3a79899c43d0 h1:86HhScVfk7ApkB1dssCL9maYHz0EzDFEn0G1omwgbW8= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231120144902-3a79899c43d0/go.mod h1:eIy7raRUU0xxzyz5Kz6CWyeed8l7L0TYdHxXwsJKzT8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231121082709-886d078ba1f0 h1:ZVQuk/GSUNf/QvlC1bnI5EqXhBTpgrisbvQPT1S7p3w= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231121082709-886d078ba1f0/go.mod h1:eIy7raRUU0xxzyz5Kz6CWyeed8l7L0TYdHxXwsJKzT8= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From 8b0f906e21c7090aa265d3bbbdc56ddc2087068c Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Fri, 24 Nov 2023 07:33:18 -0600 Subject: [PATCH 31/32] remove references to mutate filter (#12084) --- docs/configure/outputs/logstash.asciidoc | 60 +----------------------- 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/docs/configure/outputs/logstash.asciidoc b/docs/configure/outputs/logstash.asciidoc index e81df687143..59290980cd8 100644 --- a/docs/configure/outputs/logstash.asciidoc +++ b/docs/configure/outputs/logstash.asciidoc @@ -54,7 +54,7 @@ include::../../shared-kibana-endpoint.asciidoc[tag=shared-kibana-config] === {ls} configuration pipeline Finally, you must create a {ls} configuration pipeline that listens for incoming -APM Server connections, dedots the `data_stream.*` fields, and indexes received events into {es}. +APM Server connections and indexes received events into {es}. . Use the {logstash-ref}/plugins-inputs-elastic_agent.html[Elastic Agent input plugin] to configure {ls} to receive events from the APM Server. A minimal `input` config might look like this: @@ -68,54 +68,6 @@ input { } ---- -. Use the {logstash-ref}/plugins-filters-mutate.html[Mutate filter plugin] to set up <>. -Because the {ls} {es} output doesn't understand dotted field notation, you must use this filter to -dedot the default `data_stream.*` fields sent from APM Server to {ls}. -+ -[source,conf] ----- -filter { - mutate { - rename => { - "[data_stream.type]" => "[data_stream][type]" - "[data_stream.dataset]" => "[data_stream][dataset]" - "[data_stream.namespace]" => "[data_stream][namespace]" - } - } -} ----- -+ -.Expand to learn more -[%collapsible] -==== -**** -APM Server sends data stream information to {ls} in the following format: - -[source,json] ----- -{ - "data_stream.dataset": "apm", - "data_stream.type": "traces", - "data_stream.namespace": "default" -} ----- - -{es} expects to receive data stream information in the following format: - -[source,json] ----- -"data_stream" { - "dataset": "apm", - "type": "traces", - "dataset": "default" -} ----- - -The mutation defined above transforms what APM Server sends to {ls} into a data format that {es} understands. -This allows you to automatically route APM data to the appropriate data streams. -**** -==== - . Use the {logstash-ref}/plugins-outputs-elasticsearch.html[{es} output plugin] to send events to {es} for indexing. A minimal `output` config might look like this: + @@ -142,16 +94,6 @@ input { } } -filter { - mutate { - rename => { - "[data_stream.type]" => "[data_stream][type]" - "[data_stream.dataset]" => "[data_stream][dataset]" - "[data_stream.namespace]" => "[data_stream][namespace]" - } - } -} - output { elasticsearch { data_stream => "true" From 52cf775fa30903591edf5c58e5b10fd7478dfe23 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 27 Nov 2023 11:09:35 +0100 Subject: [PATCH 32/32] test: update systemtest approval doc (#12104) --- systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json index 0b741587562..b358fe48642 100644 --- a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json @@ -8,13 +8,16 @@ }, "client": { "geo": { + "city_name": "Berlin", "continent_name": "Europe", "country_iso_code": "DE", "country_name": "Germany", "location": { "lat": "dynamic", "lon": "dynamic" - } + }, + "region_iso_code": "DE-BE", + "region_name": "Land Berlin" }, "ip": "178.162.206.244" },