Merge branch 'main' into missing-apm-tracer-config-from-elastic-agent

elastic · Jul 11, 2024 · 50d2034 · 50d2034
2 parents bba802b + cc07ca8
commit 50d2034
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/changelogs/8.14.asciidoc b/changelogs/8.14.asciidoc
@@ -24,7 +24,8 @@ https://github.com/elastic/apm-server/compare/v8.14.1\...v8.14.2[View commits]
 
 No significant changes.
 
-=== Added
+[float]
+==== Added
 - Optimize memory usage and disk read IO for Tail Based Sampling {pull}13464[13464]
 
 [float]

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

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.16.0-a9f3d4e7-SNAPSHOT
+  version: 8.16.0-8e262a3b-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.16.0-a9f3d4e7-SNAPSHOT
+  version: 8.16.0-8e262a3b-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.16.0-a9f3d4e7-SNAPSHOT
+  version: 8.16.0-8e262a3b-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch