Merge branch 'master' into go-1.17

elastic · Oct 13, 2021 · 2d9e9f5 · 2d9e9f5
2 parents 2742410 + d3e8ac7
commit 2d9e9f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/changelogs/7.15.asciidoc b/changelogs/7.15.asciidoc
@@ -14,7 +14,8 @@ https://github.com/elastic/apm-server/compare/v7.15.0\...v7.15.1[View commits]
 
 [float]
 ==== Bug fixes
-- dedot http.request.body.original {pull}6256[6256]
+- dedot `http.request.body.original` {pull}6256[6256]
+- processor/otel: don't truncate `db.statement` {pull}6305[6305]
 
 [float]
 [[release-notes-7.15.0]]

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -20,7 +20,6 @@ https://github.com/elastic/apm-server/compare/7.15\...master[View commits]
 
 [float]
 ==== Bug fixes
-- processor/otel: don't truncate `db.statement` {pull}6305[6305]
 - Use timestamp of original events for transaction/span metrics {pull}6311[6311]
 
 [float]

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       kibana: { condition: service_healthy }
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-fabc5bf1-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-cf8e5c68-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -61,7 +61,7 @@ services:
       - "./testing/docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles"
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.0.0-fabc5bf1-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.0.0-cf8e5c68-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -85,7 +85,7 @@ services:
       package-registry: { condition: service_healthy }
 
   fleet-server:
-    image: docker.elastic.co/beats/elastic-agent:8.0.0-fabc5bf1-SNAPSHOT
+    image: docker.elastic.co/beats/elastic-agent:8.0.0-cf8e5c68-SNAPSHOT
     ports:
       - 8220:8220
     healthcheck:
-Original file line number
+Diff line change
@@ Expand Up @@
     [float]
     ==== Bug fixes
-    - processor/otel: don't truncate `db.statement` {pull}6305[6305]
     - Use timestamp of original events for transaction/span metrics {pull}6311[6311]
     [float]
@@ Expand Down @@