From 389c371b5fb1fc1b10fe2a492a1e34c305779ecf Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:12:59 +0100
Subject: [PATCH] docs: Prepare Changelog for 8.17.3 (#42980) (#43029)

* docs: Close changelog for 8.17.3

* Remove empty sections and update changelog entries

---------

Co-authored-by: elasticmachine <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
(cherry picked from commit 1896cdac8925179b8c823c3cbdab145c1a5ee8f1)

Co-authored-by: elastic-vault-github-plugin-prod[bot] <150874479+elastic-vault-github-plugin-prod[bot]@users.noreply.github.com>
(cherry picked from commit ef6b4a6c463b8f9bfa23802bc0e4fb742c9534e5)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
---
 CHANGELOG.asciidoc            | 44 +++++++++++++++++++++++++++++++++++
 libbeat/docs/release.asciidoc |  4 ++++
 2 files changed, 48 insertions(+)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6857404d0b78..bf115b41be74 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -3,6 +3,7 @@
 :issue: https://github.com/elastic/beats/issues/
 :pull: https://github.com/elastic/beats/pull/
 
+<<<<<<< HEAD
 [[release-notes-9.0.0-beta1]]
 === Beats version 9.0.0-beta1
 https://github.com/elastic/beats/compare/v8.17.2\...v9.0.0-beta1[View commits]
@@ -112,6 +113,49 @@ https://github.com/elastic/beats/compare/v8.17.2\...v9.0.0-beta1[View commits]
 *Functionbeat*
 
 - Remove Functionbeat binaries from CI pipelines. {issue}40745[40745] {pull}41506[41506]
+=======
+[[release-notes-8.17.3]]
+=== Beats version 8.17.3
+https://github.com/elastic/beats/compare/v8.17.2\...v8.17.3[View commits]
+
+==== Bugfixes
+
+*Affecting all Beats*
+
+- Restored event Meta fields in the Elasticsearch output's error logs. {pull}42559[42559]
+
+*Filebeat*
+
+- [Journald] Fixes handling of `journalctl` restart. A known symptom was broken multiline messages when there was a restart of journalctl while aggregating the lines. {issue}41331[41331] {pull}42595[42595]
+- Fix entityanalytics activedirectory provider full sync use before initialization bug. {pull}42682[42682]
+- In the `http_endpoint` input, fix the check for a missing HMAC HTTP header. {pull}42756[42756]
+
+*Metricbeat*
+
+- Fixed panic caused by uninitialized meraki device wifi0 and wifi1 struct pointers in the device WiFi data fetching. {issue}42745[42745] {pull}42746[42746]
+- Only fetch cluster-level index stats summary. {issue}36019[36019] {pull}42901[42901]
+- Fixed an issue in Metricbeat's Windows module where data collection would fail if the data was unavailable. {issue}42802[42802] {pull}42803[42803]
+
+*Winlogbeat*
+
+- Sync missing changes in modules pipelines. {pull}42619[42619]
+
+==== Added
+
+*Affecting all Beats*
+
+- Update Go version to 1.22.12. {pull}42681[42681]
+
+*Filebeat*
+
+- Introduce ignore older and start timestamp filters for AWS S3 input. {pull}41804[41804]
+- Publish events progressively in the Okta provider of the Entity Analytics input. {issue}40106[40106] {pull}42567[42567]
+
+*Metricbeat*
+
+- Log every 401 response from Kubernetes API Server. {pull}42714[42714]
+- Collect more fields from ES node/stats metrics and only those that are necessary. {pull}42421[42421]
+>>>>>>> ef6b4a6c4 (docs: Prepare Changelog for 8.17.3 (#42980) (#43029))
 
 
 [[release-notes-8.17.2]]
diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc
index 3cbcb16a6423..ae3a1bdc2ffb 100644
--- a/libbeat/docs/release.asciidoc
+++ b/libbeat/docs/release.asciidoc
@@ -8,7 +8,11 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
+<<<<<<< HEAD
 * <<release-notes-9.0.0-beta1>>
+=======
+* <<release-notes-8.17.3>>
+>>>>>>> ef6b4a6c4 (docs: Prepare Changelog for 8.17.3 (#42980) (#43029))
 * <<release-notes-8.17.2>>
 * <<release-notes-8.17.1>>
 * <<release-notes-8.17.0>>