From 90efe4070a44eb06c2d36813f624730728385d5d Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Mon, 3 Feb 2025 15:02:15 +0000 Subject: [PATCH] Fix conflict --- changelogs/9.0.asciidoc | 27 --------------------------- changelogs/head.asciidoc | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 changelogs/9.0.asciidoc diff --git a/changelogs/9.0.asciidoc b/changelogs/9.0.asciidoc deleted file mode 100644 index f6c059c601..0000000000 --- a/changelogs/9.0.asciidoc +++ /dev/null @@ -1,27 +0,0 @@ -[[apm-release-notes-9.0]] -== APM version 9.0 -* <> - -[float] -[[apm-release-notes-9.0.0]] -=== APM version 9.0.0 - -https://github.com/elastic/apm-server/compare/v\...v9.0.0[View commits] - -[float] -==== Bug fixes -- Fix overflow in validation of `apm-server.agent.config.cache.expiration` on 32-bit architectures {pull}15216[15216] - -[float] -==== Breaking Changes -- Change `sampling.tail.storage_limit` default to `0`. While `0` means unlimited local tail-sampling database size, it now enforces a max 80% disk usage on the disk where the data directory is located. Any tail sampling writes after this threshold will be rejected, similar to what happens when tail-sampling database size exceeds a non-0 storage limit. Setting `sampling.tail.storage_limit` to non-0 maintains the existing behavior which limits the tail-sampling database size to `sampling.tail.storage_limit` and does not have the new disk usage threshold check. {pull}15467[15467] {pull}15524[15524] - -[float] -==== Deprecations - -[float] -==== Intake API Changes - -[float] -==== Added -- Tail-based sampling: Storage layer is rewritten to use Pebble database instead of BadgerDB. The new implementation offers a substantial throughput increase while consuming significantly less memory. Disk usage is lower and more stable. See PR for benchmark details. {pull}15235[15235] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 0a72a813d7..50d017b622 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -9,7 +9,7 @@ https://github.com/elastic/apm-server/compare/8.16\...8.x[View commits] [float] ==== Breaking Changes -- Change `sampling.tail.storage_limit` default to `0`. While `0` means unlimited local tail-sampling database size, it now enforces a max 90% disk usage on the disk where the data directory is located. Any tail sampling writes after this threshold will be rejected, similar to what happens when tail-sampling database size exceeds a non-0 storage limit. Setting `sampling.tail.storage_limit` to non-0 maintains the existing behavior which limits the tail-sampling database size to `sampling.tail.storage_limit` and does not have the new disk usage threshold check. {pull}15467[15467] +- Change `sampling.tail.storage_limit` default to `0`. While `0` means unlimited local tail-sampling database size, it now enforces a max 80% disk usage on the disk where the data directory is located. Any tail sampling writes after this threshold will be rejected, similar to what happens when tail-sampling database size exceeds a non-0 storage limit. Setting `sampling.tail.storage_limit` to non-0 maintains the existing behavior which limits the tail-sampling database size to `sampling.tail.storage_limit` and does not have the new disk usage threshold check. {pull}15467[15467] {pull}15524[15524] [float] ==== Deprecations