Merge branch '8.10' into mergify/bp/8.10/pr-11662

elastic · Sep 20, 2023 · 539baf2 · 539baf2
2 parents 36ebbd8 + 4b4214e
commit 539baf2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
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.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2-d38be4c2-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.10.2-d38be4c2-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -61,7 +61,7 @@ services:
     logging: *default-logging
 
   fleet-server:
-    image: docker.elastic.co/beats/elastic-agent:8.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/beats/elastic-agent:8.10.2-d38be4c2-SNAPSHOT
     ports:
       - 8220:8220
     healthcheck:
@@ -90,7 +90,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.10.2-9d743908-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.10.2-d38be4c2-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/docs/configure/sampling.asciidoc b/docs/configure/sampling.asciidoc
@@ -65,6 +65,9 @@ This final policy is used to catch remaining trace events that don't match a str
 [id="sampling-tail-storage_limit-{input-type}"]
 == Storage limit
 The amount of storage space allocated for trace events matching tail sampling policies. Caution: Setting this limit higher than the allowed space may cause APM Server to become unhealthy.
+
+If the configured storage limit is insufficient, it logs "configured storage limit reached". The event will bypass sampling and will always be indexed when storage limit is reached.
+
 Default: `3GB`. (text)
 
 |====

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.10.2-9d743908-SNAPSHOT
+  version: 8.10.2-d38be4c2-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.10.2-9d743908-SNAPSHOT
+  version: 8.10.2-d38be4c2-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.10.2-9d743908-SNAPSHOT
+  version: 8.10.2-d38be4c2-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch