From 5a3a5175faaf5ea8761b50dd3f9dd9cd05420d21 Mon Sep 17 00:00:00 2001
From: "elastic-observability-automation[bot]"
 <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 16:39:51 +0000
Subject: [PATCH] docs: Update changelogs for 8.18 release (#15470)

Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com>
(cherry picked from commit 711b3e6fdb069c6c07114e8fa84ef88c7de39a2f)

# Conflicts:
#	changelogs/head.asciidoc
---
 CHANGELOG.asciidoc       |  3 ++-
 changelogs/8.18.asciidoc | 26 ++++++++++++++++++++++++++
 changelogs/head.asciidoc |  7 +++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/8.18.asciidoc

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 16b1fc41989..ec361561c21 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,4 +1,5 @@
 // tag::list[]
+* <<apm-release-notes-8.18>>
 * <<apm-release-notes-8.17>>
 * <<apm-release-notes-8.16>>
 * <<apm-release-notes-8.15>>
@@ -20,7 +21,7 @@
 // end::list[]
 
 // tag::includes[]
-include::./changelogs/head.asciidoc[]
+include::./changelogs/8.18.asciidoc[]
 include::./changelogs/8.17.asciidoc[]
 include::./changelogs/8.16.asciidoc[]
 include::./changelogs/8.15.asciidoc[]
diff --git a/changelogs/8.18.asciidoc b/changelogs/8.18.asciidoc
new file mode 100644
index 00000000000..c10ec50a37b
--- /dev/null
+++ b/changelogs/8.18.asciidoc
@@ -0,0 +1,26 @@
+[[apm-release-notes-8.18]]
+== APM version 8.18
+* <<apm-release-notes-8.18.0>>
+
+[float]
+[[apm-release-notes-8.18.0]]
+=== APM version 8.18.0
+
+https://github.com/elastic/apm-server/compare/v8.17.1\...v8.18.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
+
+[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 4c872e2103f..978f877147b 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -1,15 +1,22 @@
 [[release-notes-head]]
 == APM version HEAD
 
+<<<<<<< HEAD
 https://github.com/elastic/apm-server/compare/8.17\...8.x[View commits]
 
 [float]
 ==== Bug fixes
 - Fix overflow in validation of `apm-server.agent.config.cache.expiration` on 32-bit architectures {pull}15216[15216]
+=======
+https://github.com/elastic/apm-server/compare/8.18\...8.x[View commits]
+>>>>>>> 711b3e6f (docs: Update changelogs for 8.18 release (#15470))
 
 [float]
 ==== Breaking Changes
 
+[float]
+==== Bug fixes
+
 [float]
 ==== Deprecations