Merge branch 'main' into test/flush-interval

kruskall · Jun 4, 2024 · 6bb92d8 · 6bb92d8
2 parents 7d98272 + 6066059
commit 6bb92d8
Show file tree

Hide file tree

Showing 47 changed files with 1,361 additions and 3,388 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20240530134801-98202e442820
+Version: v7.0.0-alpha2.0.20240603094318-8cc85a2d59b6
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240530134801-98202e442820/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240603094318-8cc85a2d59b6/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
@@ -596,11 +596,11 @@ License Version 2.0.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-client/v7
-Version: v7.9.0
+Version: v7.10.0
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.9.0/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.10.0/LICENSE.txt:
 
 ELASTIC LICENSE AGREEMENT
 
@@ -829,11 +829,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.9.10
+Version: v0.9.11
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.10/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.11/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -1462,11 +1462,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.2/LIC
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/go-docappender/v2
-Version: v2.1.2
+Version: v2.1.3
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.2/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.3/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/changelogs/8.14.asciidoc b/changelogs/8.14.asciidoc
@@ -17,6 +17,10 @@ https://github.com/elastic/apm-server/compare/v8.13.2\...v8.14.0[View commits]
 [float]
 ==== Intake API Changes
 
+[float]
+==== Bug fixes
+- Remove error reason from logs when Elasticsearch returns unavailable_shards_exception {pull}13287[13287]
+
 [float]
 ==== Added
 - OpenTelemetry Distro Name will now be used for `agent.name` and `agent.version` {pull}12940[12940]

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.15.0-44c17e84-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-9180a854-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.15.0-44c17e84-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.15.0-9180a854-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.15.0-44c17e84-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.15.0-9180a854-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/docs/README.md b/docs/README.md
@@ -8,3 +8,11 @@
 > * A list of all **breaking changes** are documented in [`changelogs/all-breaking-changes.asciidoc`](/changelogs/all-breaking-changes.asciidoc).
 > * **Sample data sets** that are injected into the docs are in the [`docs/data/`](/docs/data/) directory.
 > * **Specifications** that are injected into the docs are in the [`docs/spec/`](/docs/spec/) directory.
+
+To generate the bundled files in the [`docs/spec/openapi`](/docs/spec/openapi) directory, use [redocly bundle](https://redocly.com/docs/cli/commands/bundle/). For example:
+
+```
+npx @redocly/cli bundle apm-openapi.yaml --output bundled.yaml --ext yaml
+npx @redocly/cli bundle apm-openapi.yaml --output bundled.json --ext json
+```
+