Merge branch 'main' into issue-obs-docs-2894

.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:

NOTICE.txt

@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]
 
 --------------------------------------------------------------------------------
 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/[email protected].20231018064857-d3c42ef75b93/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].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

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]

docs/common-problems.asciidoc

@@ -7,7 +7,7 @@ This section describes common problems you might encounter when using a Fleet-ma
 * <<common-response-codes>>
 * <<common-ssl-problems>>
 * <<io-timeout>>
-* <<field-limit-exceeded-legacy>>
+* <<field-limit-exceeded>>
 * <<tail-based-sampling-memory-disk-io>>
 
 [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
 <<read_timeout,maximum duration for reading an entire request>>.
 
-[[field-limit-exceeded-legacy]]
+[[field-limit-exceeded]]
 [float]
 === Field limit exceeded
 

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
 

docs/upgrading-to-8.x.asciidoc

@@ -29,7 +29,7 @@ See the APM <<release-notes,release notes>>, <<apm-breaking,breaking changes>> 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}
 
 ++++
-<titleabbrev>Self-installation standalone (legacy)</titleabbrev>
+<titleabbrev>Self-installation standalone</titleabbrev>
 ++++
 
-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}
 
 ++++
-<titleabbrev>{ecloud} standalone (legacy)</titleabbrev>
+<titleabbrev>{ecloud} standalone</titleabbrev>
 ++++
 
-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}.

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!
 

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

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=

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 {

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)

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
 )
 

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=

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

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=