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

elastic · Oct 26, 2023 · 79585d7 · 79585d7
2 parents 0f20167 + 5871994
commit 79585d7
Show file tree

Hide file tree

Showing 34 changed files with 256 additions and 160 deletions.
diff --git 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:

diff --git a/Makefile b/Makefile
@@ -37,9 +37,7 @@ CURRENT_DIR=$(shell dirname $(shell readlink -f $(firstword $(MAKEFILE_LIST))))
 
 APM_SERVER_BINARIES:= \
 	build/apm-server-linux-amd64 \
-	build/apm-server-linux-386 \
 	build/apm-server-linux-arm64 \
-	build/apm-server-windows-386.exe \
 	build/apm-server-windows-amd64.exe \
 	build/apm-server-darwin-amd64 \
 	build/apm-server-darwin-arm64
@@ -64,7 +62,6 @@ $(APM_SERVER_BINARIES):
 build/apm-server-linux-%: GOOS=linux
 build/apm-server-darwin-%: GOOS=darwin
 build/apm-server-windows-%: GOOS=windows
-build/apm-server-%-386 build/apm-server-%-386.exe: GOARCH=386
 build/apm-server-%-amd64 build/apm-server-%-amd64.exe: GOARCH=amd64
 build/apm-server-%-amd64 build/apm-server-%-amd64.exe: GOFLAGS+=-buildmode=pie
 build/apm-server-%-arm64 build/apm-server-%-arm64.exe: GOARCH=arm64
@@ -75,7 +72,6 @@ GOVERSIONINFO_FLAGS := \
 	-product-version "$(APM_SERVER_VERSION)" \
 	-comment "commit=$(GITCOMMIT)"
 
-build/apm-server-windows-386.exe: x-pack/apm-server/versioninfo_windows_386.syso
 build/apm-server-windows-amd64.exe: x-pack/apm-server/versioninfo_windows_amd64.syso
 x-pack/apm-server/versioninfo_windows_amd64.syso: GOVERSIONINFO_FLAGS+=-64
 x-pack/apm-server/versioninfo_%.syso: $(GOVERSIONINFO) $(GITREFFILE) packaging/versioninfo.json

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -362,11 +362,11 @@ these terms.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/apm-data
-Version: v0.1.1-0.20230928144734-40b63726f3b7
+Version: v0.1.1-0.20231019084040-a0f7950e9775
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20230928144734-40b63726f3b7/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231019084040-a0f7950e9775/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -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.20231016183702-4c34c41039be
+Version: v7.0.0-alpha2.0.20231025101650-bbf0111c1d50
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231016183702-4c34c41039be/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
@@ -5282,11 +5282,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v
 
 --------------------------------------------------------------------------------
 Dependency : go.elastic.co/apm/v2
-Version: v2.4.4
+Version: v2.4.5
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/[email protected].4/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/[email protected].5/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -5526,11 +5526,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/consumer
-Version: v0.81.0
+Version: v0.87.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.81.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.87.0/LICENSE:
 
 
                                  Apache License
@@ -5738,11 +5738,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/pdata
-Version: v1.0.0-rcv0013
+Version: v1.0.0-rcv0016
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/[email protected]rcv0013/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/[email protected]rcv0016/LICENSE:
 
 
                                  Apache License
@@ -6372,11 +6372,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/otel/sdk/metric
-Version: v0.40.0
+Version: v1.19.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v0.40.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.19.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -6611,11 +6611,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : go.uber.org/zap
-Version: v1.25.0
+Version: v1.26.0
 Licence type (autodetected): MIT
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.25.0/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.26.0/LICENSE.txt:
 
 Copyright (c) 2016-2017 Uber Technologies, Inc.
 
@@ -15082,11 +15082,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : github.com/prometheus/procfs
-Version: v0.10.1
+Version: v0.11.1
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.10.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.11.1/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -17439,11 +17439,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected]/LICENS
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/semconv
-Version: v0.81.0
+Version: v0.87.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.81.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.87.0/LICENSE:
 
 
                                  Apache License
@@ -17651,11 +17651,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semc
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/otel/sdk
-Version: v1.17.0
+Version: v1.19.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.17.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.19.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/changelogs/8.10.asciidoc b/changelogs/8.10.asciidoc
@@ -46,6 +46,7 @@ Fix tail-based sampling discarding low throughput and low sample rate traces {pu
 ==== Breaking Changes
 - 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]
 
 [float]
 ==== Bug fixes

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -19,3 +19,4 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits]
 [float]
 ==== 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]
diff --git 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-ac05de1e-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-0f0dbad4-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.12.0-ac05de1e-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.12.0-0f0dbad4-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.12.0-ac05de1e-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.12.0-0f0dbad4-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/docs/access-api-keys.asciidoc b/docs/access-api-keys.asciidoc
@@ -34,12 +34,24 @@ In the role descriptors box, assign the appropriate privileges to the new API ke
             {
                 "names": ["{beat_default_index_prefix}-*"],
                 "privileges": ["create_index", "create_doc"]
-            },
+            }
+        ]
+    },
+    "{beat_default_index_prefix}_sourcemap": {
+        "index": [
             {
-                "names": ["{beat_default_index_prefix}-*sourcemap"],
+                "names": [".apm-source-map"],
                 "privileges": ["read"]
-            },
-      ]
+            }
+        ]
+    },
+    "{beat_default_index_prefix}_agentcfg": {
+        "index": [
+            {
+                "names": [".apm-agent-configuration"],
+                "privileges": ["read"]
+            }
+        ]
     }
 }
 ----
@@ -123,11 +135,23 @@ POST /_security/api_key
         {
           "names": ["{beat_default_index_prefix}-*"],
           "privileges": ["create_index", "create_doc"]
-        },
+        }
+      ]
+    },
+    "{beat_default_index_prefix}_sourcemap": {
+      "index": [
+        {
+          "names": [".apm-source-map"],
+          "privileges": ["read"]
+        }
+      ]
+    },
+    "{beat_default_index_prefix}_agentcfg": {
+      "index": [
         {
-          "names": ["{beat_default_index_prefix}-*sourcemap"],
+          "names": [".apm-agent-configuration"],
           "privileges": ["read"]
-        },
+        }
       ]
     }
   }

diff --git a/docs/api-info.asciidoc b/docs/api-info.asciidoc
@@ -8,22 +8,56 @@ This lightweight endpoint is useful as a server up/down health check.
 [[api-info-endpoint]]
 === Server Information endpoint
 
-Send an `HTTP GET` request to the server information endpoint:
+This is the server information endpoint:
 
 [source,bash]
 ------------------------------------------------------------
 http(s)://{hostname}:{port}/
 ------------------------------------------------------------
 
-This endpoint always returns an HTTP 200.
+Sending an `HTTP GET` or `HTTP POST` request to the server information endpoint
+will return an HTTP 200, indicating that the server is up.
 
-If <<api-key>> or a <<secret-token>> is configured, requests to this endpoint must be authenticated.
+To configure authenticated access to the APM server,
+the instructions at <<api-key,APM API key>> or <<secret-token,APM Secret Token>>,
+must be followed to configure the correct permissions for APM access.
+
+If an <<api-key>> or a <<secret-token>> is passed along with
+the `HTTP GET` or `HTTP POST` request, in addition to an HTTP 200,
+the response payload will include some information about the APM server.
+
+[float]
+[[api-info-example-get-without-credentials]]
+==== Example: GET, without credentials
+
+Example APM Server status request with GET, without credentials:
+
+["source","sh",subs="attributes"]
+---------------------------------------------------------------------------
+curl --verbose -X GET http://127.0.0.1:8200
+
+*   Trying 127.0.0.1:8200...
+* TCP_NODELAY set
+* Connected to 127.0.0.1 (10.244.3.40) port 8200 (#0)
+> GET / HTTP/1.1
+> Host: 127.0.0.1:8200
+> User-Agent: curl/7.68.0
+> Accept: */*
+>
+* Mark bundle as not supporting multiuse
+< HTTP/1.1 200 OK
+< X-Content-Type-Options: nosniff
+< Date: Tue, 17 Oct 2023 22:04:05 GMT
+< Content-Length: 0
+<
+* Connection #0 to host 127.0.0.1 left intact
+---------------------------------------------------------------------------
 
 [float]
-[[api-info-examples]]
-==== Example
+[[api-info-example-post-with-secret-token]]
+==== Example: POST, with secret token
 
-Example APM Server information request:
+Example APM Server information request with POST, with a <<secret-token>>:
 
 ["source","sh",subs="attributes"]
 ---------------------------------------------------------------------------

diff --git a/docs/configure/rum.asciidoc b/docs/configure/rum.asciidoc
@@ -134,7 +134,7 @@ the options in this section are only supported by the APM Server binary.
 == `source_mapping.enabled`
 Used to enable/disable <<source-map-how-to,source mapping>> for RUM events.
 When enabled, the APM Server needs additional privileges to read source maps.
-See <<privileges-to-publish-events>> for more details.
+See <<privileges-rum-source-mapping>> for more details.
 
 Default: `true`