Resolve conflicts.

elastic · Jan 5, 2024 · 5b89f7b · 5b89f7b
1 parent 3f9992c
commit 5b89f7b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 28 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -59,26 +59,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Affecting all Beats*
 
-
-- Upgrade to Go 1.20.12. {pull}37352[37352]
-- Added append Processor which will append concrete values or values from a field to target. {issue}29934[29934] {pull}33364[33364]
-- When running under Elastic-Agent the status is now reported per Unit instead of the whole Beat {issue}35874[35874] {pull}36183[36183]
-- Add warning message to SysV init scripts for RPM-based systems that lack `/etc/rc.d/init.d/functions`. {issue}35708[35708] {pull}36188[36188]
-- Mark `translate_sid` processor is GA. {issue}36279[36279] {pull}36280[36280]
-- dns processor: Add support for forward lookups (`A`, `AAAA`, and `TXT`). {issue}11416[11416] {pull}36394[36394]
-- Mark `syslog` processor as GA, improve docs about how processor handles syslog messages. {issue}36416[36416] {pull}36417[36417]
-- Add support for AWS external IDs. {issue}36321[36321] {pull}36322[36322]
-- [Enhanncement for host.ip and host.mac] Disabling netinfo.enabled option of add-host-metadata processor {pull}36506[36506]
-  Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will disable the netinfo.enabled option of add_host_metadata processor
-- allow `queue` configuration settings to be set under the output. {issue}35615[35615] {pull}36788[36788]
-- Beats will now connect to older Elasticsearch instances by default {pull}36884[36884]
-- Raise up logging level to warning when attempting to configure beats with unknown fields from autodiscovered events/environments
-- elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}36843[36843]
-- Upgrade golang/x/net to v0.17.0. Updates the publicsuffix table used by the registered_domain processor. {pull}36969[36969]
-Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will disable the netinfo.enabled option of add_host_metadata processor
 - Upgrade to Go 1.21.5. {pull}37550[37550]
-- The Elasticsearch output can now configure performance presets with the `preset` configuration field. {pull}37259[37259]
-- Upgrade to elastic-agent-libs v0.7.3 and golang.org/x/crypto v0.17.0. {pull}37544[37544]
 
 *Auditbeat*
 

diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.12
+FROM golang:1.21.5
 
 RUN \
     apt-get update \

diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.12
+FROM golang:1.21.5
 
 RUN \
     apt-get update \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 :stack-version: 7.17.16
 :doc-branch: 7.17
-:go-version: 1.20.12
-=======
-:stack-version: 8.13.0
-:doc-branch: main
 :go-version: 1.21.5
->>>>>>> d1b32774ae (Update to Go 1.21.5 (#37550))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.12
+FROM golang:1.21.5
 
 RUN \
     apt-get update \