From e7e4853cfe20d96e64420bd7ea2b266e2b2d451a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 25 Oct 2023 09:46:30 +0200 Subject: [PATCH 1/5] mergify: add backport label for the 7.17 backports (#11931) This will help with the auto-merge --- .mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 5cd9cbc8d86..1f3ae86e04f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -92,6 +92,8 @@ pull_request_rules: - "{{ author }}" branches: - "7.17" + labels: + - "backport" title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" - name: backport patches to 7.16 branch conditions: From 3b737c9199dee8f59623cde3124548286b88a843 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 25 Oct 2023 12:28:09 -0400 Subject: [PATCH 2/5] [updatecli] Update to elastic/beats@bbf0111c1d50 (#11912) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@42f2f9426043 Made with ❤️️ by updatecli * chore: Update to elastic/beats@2b7dbeaa53d5 Made with ❤️️ by updatecli * build: fix compile erros due to beats recent changes * chore: Update to elastic/beats@effe78ceac5b Made with ❤️️ by updatecli * chore: Update to elastic/beats@bbf0111c1d50 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: kruskal <99559985+kruskall@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- internal/beater/beatertest/output.go | 2 +- internal/elasticsearch/config_test.go | 1 + 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index dbcb0ea5f06..c7e934b2a8c 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.20231018064857-d3c42ef75b93 +Version: v7.0.0-alpha2.0.20231025101650-bbf0111c1d50 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231018064857-d3c42ef75b93/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231025101650-bbf0111c1d50/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 @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.3.15-0.20230913212237-dbdaf18c898b +Version: v0.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.3.15-0.20230913212237-dbdaf18c898b/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.6.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index ac3b20eb379..5e42690905c 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ 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.20231018064857-d3c42ef75b93 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231025101650-bbf0111c1d50 github.com/elastic/elastic-agent-client/v7 v7.4.0 - github.com/elastic/elastic-agent-libs v0.3.15-0.20230913212237-dbdaf18c898b + github.com/elastic/elastic-agent-libs v0.6.0 github.com/elastic/elastic-agent-system-metrics v0.7.0 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v0.2.1-0.20230829163624-c69a1cf8ce35 diff --git a/go.sum b/go.sum index 6b91478232e..2929867443e 100644 --- a/go.sum +++ b/go.sum @@ -134,14 +134,14 @@ 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.20231018064857-d3c42ef75b93 h1:Jkk/Vq79nJVDo4OtqFR/8TuzLqB9Zkv1sq2cyYceCm4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231018064857-d3c42ef75b93/go.mod h1:nVHoLIj1V0g6XdScm2ZbIezfuf3FKCHWTaFZ5DnPfSU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231025101650-bbf0111c1d50 h1:JPN/Jnn8veEgNjnmfy7p88NOGZ6GVOwipURCaqgvHFY= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231025101650-bbf0111c1d50/go.mod h1:nosWvRbRXMSEvMjpXyUw03XlEc7uejUZ3GSX2KSl6uM= 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= github.com/elastic/elastic-agent-client/v7 v7.4.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0= -github.com/elastic/elastic-agent-libs v0.3.15-0.20230913212237-dbdaf18c898b h1:a2iuOokwld+D7VhyFymVtsPoqxZ8fkkOCOOjeYU9CDM= -github.com/elastic/elastic-agent-libs v0.3.15-0.20230913212237-dbdaf18c898b/go.mod h1:mpSfrigixx8x+uMxWKl4LtdlrKIhZbA4yT2eIeIazUQ= +github.com/elastic/elastic-agent-libs v0.6.0 h1:HnL/OpAzIHlK8y1J69XQuAx4tlCzd6e2kldMHvXARvY= +github.com/elastic/elastic-agent-libs v0.6.0/go.mod h1:K6U+n84siZ66ZyG36h1/x+fw1oIZbFXEypAC6KSiFOg= 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= diff --git a/internal/beater/beatertest/output.go b/internal/beater/beatertest/output.go index 64fe7a6a230..a72dcf249a9 100644 --- a/internal/beater/beatertest/output.go +++ b/internal/beater/beatertest/output.go @@ -90,7 +90,7 @@ func makeNullOutput( _ *agentconfig.C, ) (outputs.Group, error) { client := nullOutput{observer: observer} - return outputs.Success(1, 0, client) + return outputs.Success(agentconfig.Namespace{}, 1, 0, client) } func (nullOutput) String() string { diff --git a/internal/elasticsearch/config_test.go b/internal/elasticsearch/config_test.go index 21c17cdef73..2676d31a6b9 100644 --- a/internal/elasticsearch/config_test.go +++ b/internal/elasticsearch/config_test.go @@ -170,6 +170,7 @@ func TestBeatsConfigSynced(t *testing.T) { knownUnhandled := []string{ "backoff", // we have our own version with its own type + "queue", "bulk_max_size", "escape_html", // TODO Kerberos auth (https://github.com/elastic/apm-server/issues/3794) From 3c4dea9f6e943f737ffec24e7c717aec55092117 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 06:01:28 +0200 Subject: [PATCH 3/5] build(deps): bump google.golang.org/grpc in /systemtest (#11944) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.57.0 to 1.57.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.57.0...v1.57.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- systemtest/go.mod | 2 +- systemtest/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/systemtest/go.mod b/systemtest/go.mod index 54984d3bc93..dd8be350785 100644 --- a/systemtest/go.mod +++ b/systemtest/go.mod @@ -36,7 +36,7 @@ require ( golang.org/x/sync v0.3.0 golang.org/x/sys v0.13.0 golang.org/x/time v0.3.0 - google.golang.org/grpc v1.57.0 + google.golang.org/grpc v1.57.1 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/systemtest/go.sum b/systemtest/go.sum index a59f2ce8fc6..be6dae516b3 100644 --- a/systemtest/go.sum +++ b/systemtest/go.sum @@ -292,8 +292,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1: google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg= +google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= From 587199425e7cc53747747b7887964c120bdb3b3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 00:17:13 -0400 Subject: [PATCH 4/5] build(deps): bump google.golang.org/grpc from 1.56.2 to 1.56.3 in /tools (#11945) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.56.2 to 1.56.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.56.2...v1.56.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index d944adf45b3..4420589b94f 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -245,7 +245,7 @@ require ( google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect - google.golang.org/grpc v1.56.2 // indirect + google.golang.org/grpc v1.56.3 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/tools/go.sum b/tools/go.sum index 443131bbece..263ea84e67b 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1251,8 +1251,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 1b0b81b5f5a4c1c7629cb7ea504e20537af73cf9 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 26 Oct 2023 11:12:36 -0500 Subject: [PATCH 5/5] remove legacy (#11941) --- docs/apm-breaking.asciidoc | 6 +++--- docs/common-problems.asciidoc | 6 +++--- docs/integrations-index.asciidoc | 5 ----- docs/upgrading-to-8.x.asciidoc | 10 +++++----- docs/upgrading-to-integration.asciidoc | 4 ++-- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/docs/apm-breaking.asciidoc b/docs/apm-breaking.asciidoc index 79c83efff5a..6fc931697cc 100644 --- a/docs/apm-breaking.asciidoc +++ b/docs/apm-breaking.asciidoc @@ -205,7 +205,7 @@ APM Server no longer supports installation via Homebrew. ==== All removed and changed settings Below is a list of all **removed settings** (in alphabetical order) for -users upgrading a standalone (legacy) APM Server to {stack} version 8.0. +users upgrading a standalone APM Server to {stack} version 8.0. [source,yml] ---- @@ -225,7 +225,7 @@ setup.* ---- Below is a list of **renamed settings** (in alphabetical order) for -users upgrading a standalone (legacy) APM Server to {stack} version 8.0. +users upgrading a standalone APM Server to {stack} version 8.0. [source,yml] ---- @@ -242,7 +242,7 @@ apm-server.secret_token --> apm-server.auth.secret_token ==== Supported {ecloud} settings Below is a list of all **supported settings** (in alphabetical order) for -users upgrading an {ecloud} standalone (legacy) cluster to {stack} version 8.0. +users upgrading an {ecloud} standalone cluster to {stack} version 8.0. Any previously supported settings not listed below will be removed when upgrading. [source,yml] diff --git a/docs/common-problems.asciidoc b/docs/common-problems.asciidoc index d0b3e44e65b..527833638cd 100644 --- a/docs/common-problems.asciidoc +++ b/docs/common-problems.asciidoc @@ -7,7 +7,7 @@ This section describes common problems you might encounter when using a Fleet-ma * <> * <> * <> -* <> +* <> * <> [float] @@ -18,7 +18,7 @@ If no data shows up in {es}, first make sure that your APM components are proper include::{tab-widget-dir}/no-data-indexed-widget.asciidoc[] -[[data-indexed-no-apm-legacy]] +[[data-indexed-no-apm]] [float] === Data is indexed but doesn't appear in the APM app @@ -165,7 +165,7 @@ APM agent --> Load Balancer --> APM Server The APM Server timeout can be configured by updating the <>. -[[field-limit-exceeded-legacy]] +[[field-limit-exceeded]] [float] === Field limit exceeded diff --git a/docs/integrations-index.asciidoc b/docs/integrations-index.asciidoc index 8033e576580..b375bf1c621 100644 --- a/docs/integrations-index.asciidoc +++ b/docs/integrations-index.asciidoc @@ -2,7 +2,6 @@ include::./version.asciidoc[] include::{asciidoc-dir}/../../shared/attributes.asciidoc[] :apm-integration-docs: -:apm-package-dir: {docdir}/apm-package :obs-repo-dir: {observability-docs-root}/docs/en :tab-widget-dir: {docdir}/tab-widgets @@ -14,9 +13,6 @@ endif::[] // OTHER ATTRS // TODO: Check that these are still relevant - -:libbeat-dir: {docdir}/legacy/copied-from-beats/docs -:libbeat-outputs-dir: {docdir}/legacy/copied-from-beats/outputs :version: {apm_server_version} :beatname_lc: apm-server :beatname_uc: APM Server @@ -50,7 +46,6 @@ endif::[] :docker_platform: :win_os: :linux_os: -:apm-package-dir: {docdir}/legacy/apm-package :downloads: https://artifacts.elastic.co/downloads/apm-server diff --git a/docs/upgrading-to-8.x.asciidoc b/docs/upgrading-to-8.x.asciidoc index 12fb1560bac..bde78f8d963 100644 --- a/docs/upgrading-to-8.x.asciidoc +++ b/docs/upgrading-to-8.x.asciidoc @@ -29,7 +29,7 @@ See the APM <>, <> f Starting in version 7.14, there are two ways to run Elastic APM. Determine which method you're using, then use the links below to find the correct upgrading guide. -* **Standalone (legacy)**: Users in this mode run and configure the APM Server binary. +* **Standalone**: Users in this mode run and configure the APM Server binary. This mode has been deprecated and will be removed in a future release. * **{fleet} and the APM integration**: Users in this mode run and configure {fleet} and the Elastic APM integration. @@ -49,10 +49,10 @@ This mode has been deprecated and will be removed in a future release. ==== Upgrade a self-installation of APM Server standalone to {version} ++++ -Self-installation standalone (legacy) +Self-installation standalone ++++ -This upgrade guide is for the standalone (legacy) method of running APM Server. +This upgrade guide is for the standalone method of running APM Server. Only use this guide if both of the following are true: * You have a self-installation of the {stack}, i.e. you're not using {ecloud}. @@ -182,10 +182,10 @@ For more details, or for bulk upgrade instructions, see ==== Upgrade {ecloud} APM Server standalone to {version} ++++ -{ecloud} standalone (legacy) +{ecloud} standalone ++++ -This upgrade guide is for the standalone (legacy) method of running APM Server. +This upgrade guide is for the standalone method of running APM Server. Only use this guide if both of the following are true: * You're using {ecloud}. diff --git a/docs/upgrading-to-integration.asciidoc b/docs/upgrading-to-integration.asciidoc index 1b3a8745236..4dd771c3efa 100644 --- a/docs/upgrading-to-integration.asciidoc +++ b/docs/upgrading-to-integration.asciidoc @@ -137,10 +137,10 @@ no reconfiguration is required in your APM agents. [discrete] [[apm-integration-upgrade-5]] -==== Stop the legacy APM Server +==== Stop the APM Server Once data from upgraded APM agents is visible in the {apm-app}, -it's safe to stop the legacy APM Server process. +it's safe to stop the APM Server process. Congratulations -- you now have the latest and greatest in Elastic APM!