From debf7d83a0dca31eeb4270afa5429a432e937678 Mon Sep 17 00:00:00 2001
From: "elastic-observability-automation[bot]"
 <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:31:16 +0200
Subject: [PATCH] 8.16: update docs, mergify, versions and changelogs (#14381)

* [Release] update version 8.17.0

* [Release] update changelogs for 8.16 release

---------

Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com>
---
 .mergify.yml                   | 14 ++++++++++++++
 CHANGELOG.asciidoc             |  2 ++
 changelogs/8.16.asciidoc       | 31 +++++++++++++++++++++++++++++++
 changelogs/head.asciidoc       | 12 +-----------
 cmd/intake-receiver/version.go |  2 +-
 internal/version/version.go    |  2 +-
 6 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 changelogs/8.16.asciidoc

diff --git a/.mergify.yml b/.mergify.yml
index a62731c17d1..e60530f5f53 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -359,3 +359,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.16 branch
+    conditions:
+      - merged
+      - base=8.x
+      - label=backport-8.16
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.16"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index dffd289c9bc..f31ddeb5dc8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,4 +1,5 @@
 // tag::list[]
+* <<apm-release-notes-8.16>>
 * <<apm-release-notes-8.15>>
 * <<apm-release-notes-8.14>>
 * <<apm-release-notes-8.13>>
@@ -19,6 +20,7 @@
 
 // tag::includes[]
 include::./changelogs/head.asciidoc[]
+include::./changelogs/8.16.asciidoc[]
 include::./changelogs/8.15.asciidoc[]
 include::./changelogs/8.14.asciidoc[]
 include::./changelogs/8.13.asciidoc[]
diff --git a/changelogs/8.16.asciidoc b/changelogs/8.16.asciidoc
new file mode 100644
index 00000000000..aef70522e8b
--- /dev/null
+++ b/changelogs/8.16.asciidoc
@@ -0,0 +1,31 @@
+[[apm-release-notes-8.16]]
+== APM version 8.16
+* <<apm-release-notes-8.16.0>>
+
+[float]
+[[apm-release-notes-8.16.0]]
+=== APM version 8.16.0
+
+https://github.com/elastic/apm-server/compare/v8.15.2\...v8.16.0[View commits]
+
+[float]
+==== Bug fixes
+
+- Track all bulk request response status codes {pull}13574[13574]
+- Fix a concurrent map write panic in monitoring middleware {pull}14335[14335]
+- Apply shutdown timeout to http server {pull}14339[14339]
+
+[float]
+==== Breaking Changes
+
+[float]
+==== Deprecations
+- Support for Jaeger is now deprecated, and will be removed in a future release {pull}13809[13809]
+
+[float]
+==== Intake API Changes
+
+[float]
+==== Added
+
+- APM Server will no longer retry an HTTP request that returned 502s, 503s, 504s. It will only retry 429s. {pull}13523[13523]
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index f3211c82c9f..4b71ea29c89 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -1,26 +1,16 @@
 [[release-notes-head]]
 == APM version HEAD
 
-https://github.com/elastic/apm-server/compare/8.15\...main[View commits]
-
-[float]
-==== Bug fixes
-
-- Track all bulk request response status codes {pull}13574[13574]
-- Fix a concurrent map write panic in monitoring middleware {pull}14335[14335]
-- Apply shutdown timeout to http server {pull}14339[14339]
+https://github.com/elastic/apm-server/compare/8.16\...8.x[View commits]
 
 [float]
 ==== Breaking Changes
 
 [float]
 ==== Deprecations
-- Support for Jaeger is now deprecated, and will be removed in a future release {pull}13809[13809]
 
 [float]
 ==== Intake API Changes
 
 [float]
 ==== Added
-
-- APM Server will no longer retry an HTTP request that returned 502s, 503s, 504s. It will only retry 429s. {pull}13523[13523]
diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go
index 740e7426b88..7ba1efbea28 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.16.0"
+const version = "8.17.0"
diff --git a/internal/version/version.go b/internal/version/version.go
index 26b6c4915d7..e0ffe391498 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.16.0"
+const Version = "8.17.0"