From 85800a525d6bda29990ab215f7677b89cf5c0b26 Mon Sep 17 00:00:00 2001
From: obltmachine <150269514+obltmachine@users.noreply.github.com>
Date: Wed, 20 Nov 2024 18:52:30 +0000
Subject: [PATCH 1/3] [Release] update version 8.18.0

---
 .mergify.yml                   | 14 ++++++++++++++
 cmd/intake-receiver/version.go |  2 +-
 internal/version/version.go    |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index e60530f5f53..e866ea01f3a 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -373,3 +373,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.17 branch
+    conditions:
+      - merged
+      - base=8.x
+      - label=backport-8.17
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.17"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go
index 7ba1efbea28..7aa3ef5263d 100644
--- a/cmd/intake-receiver/version.go
+++ b/cmd/intake-receiver/version.go
@@ -18,4 +18,4 @@
 package main
 
 // version matches the APM Server's version
-const version = "8.17.0"
+const version = "8.18.0"
diff --git a/internal/version/version.go b/internal/version/version.go
index e0ffe391498..ceccaa35398 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -18,4 +18,4 @@
 package version
 
 // Version holds the APM Server version.
-const Version = "8.17.0"
+const Version = "8.18.0"

From a23f47dffc696ee4d3243c52bc31698060048e1f Mon Sep 17 00:00:00 2001
From: obltmachine <150269514+obltmachine@users.noreply.github.com>
Date: Wed, 20 Nov 2024 18:52:32 +0000
Subject: [PATCH 2/3] [Release] update changelogs for 8.17 release

---
 CHANGELOG.asciidoc       |  2 ++
 changelogs/8.17.asciidoc | 21 +++++++++++++++++++++
 changelogs/head.asciidoc |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/8.17.asciidoc

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f31ddeb5dc8..16b1fc41989 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,4 +1,5 @@
 // tag::list[]
+* <<apm-release-notes-8.17>>
 * <<apm-release-notes-8.16>>
 * <<apm-release-notes-8.15>>
 * <<apm-release-notes-8.14>>
@@ -20,6 +21,7 @@
 
 // tag::includes[]
 include::./changelogs/head.asciidoc[]
+include::./changelogs/8.17.asciidoc[]
 include::./changelogs/8.16.asciidoc[]
 include::./changelogs/8.15.asciidoc[]
 include::./changelogs/8.14.asciidoc[]
diff --git a/changelogs/8.17.asciidoc b/changelogs/8.17.asciidoc
new file mode 100644
index 00000000000..3e677e4d0bf
--- /dev/null
+++ b/changelogs/8.17.asciidoc
@@ -0,0 +1,21 @@
+[[apm-release-notes-8.17]]
+== APM version 8.17
+* <<apm-release-notes-8.17.0>>
+
+[float]
+[[apm-release-notes-8.17.0]]
+=== APM version 8.17.0
+
+https://github.com/elastic/apm-server/compare/v8.16.0\...v8.17.0[View commits]
+
+[float]
+==== Breaking Changes
+
+[float]
+==== Deprecations
+
+[float]
+==== Intake API Changes
+
+[float]
+==== Added
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index 4b71ea29c89..69341cca9dc 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -1,7 +1,7 @@
 [[release-notes-head]]
 == APM version HEAD
 
-https://github.com/elastic/apm-server/compare/8.16\...8.x[View commits]
+https://github.com/elastic/apm-server/compare/8.17\...8.x[View commits]
 
 [float]
 ==== Breaking Changes

From 8eef9f87039ba2f3bcebc2ad4e1fa4d6d7ffd7f5 Mon Sep 17 00:00:00 2001
From: Kostiantyn Masliuk <1pkg@protonmail.com>
Date: Wed, 20 Nov 2024 11:30:23 -0800
Subject: [PATCH 3/3] changelog: update changelog entry for 8.17

---
 changelogs/8.17.asciidoc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/changelogs/8.17.asciidoc b/changelogs/8.17.asciidoc
index 3e677e4d0bf..1ff36e81cbe 100644
--- a/changelogs/8.17.asciidoc
+++ b/changelogs/8.17.asciidoc
@@ -8,6 +8,11 @@
 
 https://github.com/elastic/apm-server/compare/v8.16.0\...v8.17.0[View commits]
 
+[float]
+==== Bug fixes
+
+- Clear scroll after completing scroll requests {pull}14551[14551]
+
 [float]
 ==== Breaking Changes
 
@@ -19,3 +24,6 @@ https://github.com/elastic/apm-server/compare/v8.16.0\...v8.17.0[View commits]
 
 [float]
 ==== Added
+
+- The mappings are updated to disable date_detection for all APM data streams.
+  The change is applied through https://github.com/elastic/elasticsearch/pull/116995[elasticsearch#116995].
\ No newline at end of file