Merge branch 'main' into docs-fix-distributed-tracing-go

elastic · Oct 16, 2023 · 1686766 · 1686766
2 parents 867dcd5 + 3874000
commit 1686766
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 12 deletions.
diff --git a/NOTICE.txt b/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.20231011173258-e322104a8cc2
+Version: v7.0.0-alpha2.0.20231016132619-6be0d18448bb
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231011173258-e322104a8cc2/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231016132619-6be0d18448bb/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/changelogs/8.10.asciidoc b/changelogs/8.10.asciidoc
@@ -3,11 +3,21 @@
 
 https://github.com/elastic/apm-server/compare/8.9\...8.10[View commits]
 
+* <<release-notes-8.10.4>>
 * <<release-notes-8.10.3>>
 * <<release-notes-8.10.2>>
 * <<release-notes-8.10.1>>
 * <<release-notes-8.10.0>>
 
+[float]
+[[release-notes-8.10.4]]
+=== APM version 8.10.4
+
+[float]
+==== Bug fixes
+
+- RPM package upgrade no longer overwrites the apm-server.yml config {pull}11808[11808]
+
 [float]
 [[release-notes-8.10.3]]
 === APM version 8.10.3

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -9,7 +9,6 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits]
 [float]
 ==== Bug fixes
 - Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729].
-- RPM package upgrade no longer overwrites the apm-server.yml config {pull}11808[11808]
 
 [float]
 ==== Deprecations

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

diff --git 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.20230928144734-40b63726f3b7
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231011173258-e322104a8cc2
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231016132619-6be0d18448bb
 	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-system-metrics v0.7.0

diff --git a/go.sum b/go.sum
@@ -136,8 +136,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.20230928144734-40b63726f3b7 h1:QcfCHAh1bHj9WN6y75bD6mBlIIlz9dJVKJSJVXCu4TM=
 github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7/go.mod h1:lMTMoCWNadiDJih/tLechuMTtumEeedtKJlBOYAv030=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231011173258-e322104a8cc2 h1:KvtJhHKwy2OCEbsc5ulmaX5QBhnSOgI/16KK7DW+Oy8=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231011173258-e322104a8cc2/go.mod h1:3oRWKLGbtO3OZD/tvh9i9j2tRjwWznlg/iqs1/quMHw=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231016132619-6be0d18448bb h1:wmyHBzA6PMEcLKmq5HKQY0FiufGi1wOiggZqbE7eKSo=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231016132619-6be0d18448bb/go.mod h1:3oRWKLGbtO3OZD/tvh9i9j2tRjwWznlg/iqs1/quMHw=
 github.com/elastic/elastic-agent-autodiscover v0.6.2 h1:7P3cbMBWXjbzA80rxitQjc+PiWyZ4I4F4LqrCYgYlNc=
 github.com/elastic/elastic-agent-autodiscover v0.6.2/go.mod h1:yXYKFAG+Py+TcE4CCR8EAbJiYb+6Dz9sCDoWgOveqtU=
 github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo=

diff --git 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-1a1295ff-SNAPSHOT
+  version: 8.12.0-1359bda9-SNAPSHOT
   count: 1
   http:
     tls:

diff --git 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-1a1295ff-SNAPSHOT
+  version: 8.12.0-1359bda9-SNAPSHOT
   auth:
     fileRealm:
       - secretName: elasticsearch-admin

diff --git 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-1a1295ff-SNAPSHOT
+  version: 8.12.0-1359bda9-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch