From 748d3d8b0ecaa7669ac2e8c20bf1eee4d6287e0a Mon Sep 17 00:00:00 2001
From: florent-leborgne <florent.leborgne@elastic.co>
Date: Fri, 22 Nov 2024 10:59:37 +0100
Subject: [PATCH] [Docs] Add deprecation notice for MacOS x86_64 builds
 (#201329)

This PR adds a deprecation notice to the release and upgrade notes
regarding macOS x86_64 builds.

+a small fix of reordering deprecation and breaking changes correctly in
8.16 release notes

(cherry picked from commit 4ad0c2d4f74541bd680bb51755fbefd2a12b2383)
---
 docs/CHANGELOG.asciidoc     | 39 ++++++++++++++++++++++++-------------
 docs/upgrade-notes.asciidoc | 12 ++++++++++++
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 467b39c6b698d..9fd524069b80c 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -149,6 +149,21 @@ For information about how to create APM API keys, please check the {observabilit
 For more information, refer to {kibana-issue}199891[#199891] and {kibana-issue}199892[#199892].
 ====
 
+[float]
+[[breaking-changes-8.16.0]]
+=== Breaking changes
+
+Breaking changes can prevent your application from optimal operation and performance.
+Before you upgrade to 8.16.0, review the breaking changes, then mitigate the impact to your application.
+
+[discrete]
+.Updated request processing during shutdown.
+[%collapsible]
+====
+*Details* +
+During shutdown, {kib} now waits for all the ongoing requests to complete according to the `server.shutdownTimeout` setting. During that period, the incoming socket is closed and any new incoming requests are rejected. Before this update, new incoming requests received a response with the status code 503 and body `{"message": "Kibana is shutting down and not accepting new incoming requests"}`. For more information, refer to {kibana-pull}180986[#180986].
+==== 
+
 [float]
 [[deprecations-8.16.0]]
 === Deprecations
@@ -157,6 +172,16 @@ The following functionality is deprecated in 8.16.0, and will be removed in 9.0.
 Deprecated functionality does not have an immediate impact on your application, but we strongly recommend
 you make the necessary updates after you upgrade to 8.16.0.
 
+[discrete]
+.New versions of Kibana for macOS x86_64 will end after 8.17.
+[%collapsible]
+====
+*Details* +
+New versions of Kibana builds for macOS x86_64 are deprecated and will no longer be released after 8.17.  Kibana for macOS AArch64 is unaffected. 
+
+Use Docker to run new versions of Kibana on macOS 86x_64.
+====
+
 [discrete]
 .The Logs Stream is now hidden by default in favor of the Logs Explorer app.
 [%collapsible]
@@ -179,20 +204,6 @@ The Observability AI Assistant specific advanced setting for Logs index patterns
 //!!TODO!!
 ====
 
-[float]
-[[breaking-changes-8.16.0]]
-=== Breaking changes
-
-Breaking changes can prevent your application from optimal operation and performance.
-Before you upgrade to 8.16.0, review the breaking changes, then mitigate the impact to your application.
-
-[discrete]
-.Updated request processing during shutdown.
-[%collapsible]
-====
-*Details* +
-During shutdown, {kib} now waits for all the ongoing requests to complete according to the `server.shutdownTimeout` setting. During that period, the incoming socket is closed and any new incoming requests are rejected. Before this update, new incoming requests received a response with the status code 503 and body `{"message": "Kibana is shutting down and not accepting new incoming requests"}`. For more information, refer to {kibana-pull}180986[#180986].
-==== 
   
 [float]
 [[features-8.16.0]]
diff --git a/docs/upgrade-notes.asciidoc b/docs/upgrade-notes.asciidoc
index a6e5a34db20e9..965942e7c2256 100644
--- a/docs/upgrade-notes.asciidoc
+++ b/docs/upgrade-notes.asciidoc
@@ -1618,6 +1618,18 @@ The following security_linux and security_windows job configurations are updated
 ** v3_windows_rare_user_type10_remote_login
 ====
 
+// Setup
+
+[discrete]
+[[deprecation-macos-x8664]]
+.[Setup] New versions of Kibana for macOS x86_64 will end after 8.17.
+[%collapsible]
+====
+*Details* +
+New versions of Kibana builds for macOS x86_64 are deprecated and will no longer be released after 8.17.  Kibana for macOS AArch64 is unaffected. 
+
+Use Docker to run new versions of Kibana on macOS 86x_64.
+====
 
 // Sharing & Reporting