Skip to content

Commit ce5f01f

Browse files
Merge branch 'main' into clean-detections-and-alert-page
2 parents a0ef068 + 9c37254 commit ce5f01f

File tree

5 files changed

+1
-165
lines changed

5 files changed

+1
-165
lines changed

raw-migrated-files/docs-content/serverless/security-automatic-import.md

Lines changed: 0 additions & 99 deletions
This file was deleted.

raw-migrated-files/docs-content/serverless/security-vuln-management-faq.md

Lines changed: 0 additions & 59 deletions
This file was deleted.

raw-migrated-files/security-docs/security/index.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

raw-migrated-files/toc.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ toc:
103103
- file: docs-content/serverless/project-setting-data.md
104104
- file: docs-content/serverless/project-settings-alerts.md
105105
- file: docs-content/serverless/project-settings-content.md
106-
- file: docs-content/serverless/security-automatic-import.md
107-
- file: docs-content/serverless/security-vuln-management-faq.md
108106
- file: docs-content/serverless/what-is-observability-serverless.md
109107
- file: elasticsearch-hadoop/elasticsearch-hadoop/index.md
110108
children:
@@ -145,7 +143,6 @@ toc:
145143
children:
146144
- file: observability-docs/observability/index.md
147145
- file: observability-docs/observability/obs-ai-assistant.md
148-
- file: security-docs/security/index.md
149146
- file: stack-docs/elastic-stack/index.md
150147
children:
151148
- file: stack-docs/elastic-stack/installing-stack-demo-self.md

solutions/observability/apps/transaction-sampling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Enable tail-based sampling with [Enable tail-based sampling](../../../solutions/
198198
Trace events are matched to policies in the order specified. Each policy list must conclude with a default policy — one that only specifies a sample rate. This default policy is used to catch remaining trace events that don’t match a stricter policy. Requiring this default policy ensures that traces are only dropped intentionally. If you enable tail-based sampling and send a transaction that does not match any of the policies, APM Server will reject the transaction with the error `no matching policy`.
199199

200200
::::{important}
201-
Please note that from version `8.3.1` APM Server implements a default storage limit of 3GB, but, due to how the limit is calculated and enforced the actual disk space may still grow slightly over the limit.
201+
Please note that from version `9.0.0` APM Server has an unlimited storage limit, but will stop writing when the disk where the database resides reaches 80% usage. Due to how the limit is calculated and enforced, the actual disk space may still grow slightly over this disk usage based limit, or any configured storage limit.
202202
::::
203203

204204

0 commit comments

Comments
 (0)