Forward-port 7.14.2 changelog to master (#27975)

* Forward port 7.14.2 changelog to 7.x (#27972)

* Forward port 7.14.2 changelog to 7.15 (#27971)

* docs: Prepare Changelog for 7.14.2 (#27953)

* docs: Close changelog for 7.14.2

* Clean up

* Update CHANGELOG.asciidoc

Co-authored-by: EamonnTP <Eamonn.Smith@elastic.co>

Co-authored-by: Andres Rodriguez <andresrc@gmail.com>
Co-authored-by: Andres Rodriguez <andres.rodriguez@elastic.co>
Co-authored-by: EamonnTP <Eamonn.Smith@elastic.co>
(cherry picked from commit 8a94abc)

* Remove additional lines

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
(cherry picked from commit 7892671)

* Remove additional lines

(cherry picked from commit 8afdddc)

* Manual fixes

CHANGELOG.asciidoc

@@ -12,6 +12,17 @@ Changes will be described in a later alpha / beta.
 === Beats version 8.0.0-alpha1
 
 Changes will be described in a later alpha / beta.
+[[release-notes-7.14.2]]
+=== Beats version 7.14.2
+https://github.com/elastic/beats/compare/v7.14.1...v7.14.2[View commits]
+
+==== Bugfixes
+
+*Filebeat*
+
+- Auditd module: Fix the top exec commands dashboard visualization. {pull}27638[27638]
+- Store offset in `log.offset` field of events from the filestream input. {pull}27688[27688]
+- Fix `httpjson` input rate limit processing and documentation. {pull}27739[27739]
 
 [[release-notes-7.14.1]]
 === Beats version 7.14.1

CHANGELOG.next.asciidoc

@@ -312,15 +312,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix Zeek dashboard reference to `zeek.ssl.server.name` field. {pull}21696[21696]
 - Fix for `field [source] not present as part of path [source.ip]` error in azure pipelines. {pull}22377[22377]
 - Drop aws.vpcflow.pkt_srcaddr and aws.vpcflow.pkt_dstaddr when equal to "-". {pull}22721[22721] {issue}22716[22716]
-- Convert the o365 module's `client.port` and `source.port` to numbers (from strings) in events. {pull}22939[22939]
-- Fix gcp/vpcflow module error where input type was defaulting to file. {pull}24719[24719]
-- Fix s3 input when there is a blank line in the log file. {pull}25357[25357]
 - Fixes the Snyk module to work with the new API changes. {pull}27358[27358]
 - Fixes a bug in `http_endpoint` that caused numbers encoded as strings. {issue}27382[27382] {pull}27480[27480]
 - Update indentation for azure filebeat configuration. {pull}26604[26604]
-- Auditd: Fix Top Exec Commands dashboard visualization. {pull}27638[27638]
-- Store offset in `log.offset` field of events from the filestream input. {pull}27688[27688]
-- Fix `httpjson` input rate limit processing and documentation. {pull}[]
 - Update Filebeat compatibility function to remove processor description field on ES < 7.9.0 {pull}27774[27774]
 - Make filestream events ECS compliant. {issue}27776[27776]
 

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-8.0.0-alpha1>>
+=======
+* <<release-notes-7.14.2>>
+>>>>>>> 8afdddc333 (Forward port 7.14.2 changelog to 7.x (#27972))
 * <<release-notes-7.14.1>>
 * <<release-notes-7.14.0>>
 * <<release-notes-7.13.4>>