From d32cb6d3a5b8c5f86952f17502b343a4ddf65310 Mon Sep 17 00:00:00 2001 From: Taylor Swanson <90622908+taylor-swanson@users.noreply.github.com> Date: Thu, 18 Apr 2024 11:29:23 -0500 Subject: [PATCH 1/2] [netflow] Restore netflow input on Windows (#39024) - In 8.13, the netflow was accidentally removed from the list of inputs for Windows. This restores netflow as an input under Windows. (cherry picked from commit 5e16f25d28d6e33f7016b371dd09baa4fe2a11b0) --- CHANGELOG.next.asciidoc | 2 ++ x-pack/filebeat/input/default-inputs/inputs_windows.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 35804f443884..c9d0f8127736 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -135,6 +135,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - entity-analytics input: Improve structured logging. {pull}38990[38990] - Fix config validation for CEL and HTTPJSON inputs when using password grant authentication and `client.id` or `client.secret` are not present. {pull}38962[38962] - Updated Websocket input title to align with existing inputs {pull}39006[39006] +- Restore netflow input on Windows {pull}39024[39024] +- Upgrade azure-event-hubs-go and azure-storage-blob-go dependencies. {pull}38861[38861] *Heartbeat* diff --git a/x-pack/filebeat/input/default-inputs/inputs_windows.go b/x-pack/filebeat/input/default-inputs/inputs_windows.go index 361883f39ad5..821131c8bc2c 100644 --- a/x-pack/filebeat/input/default-inputs/inputs_windows.go +++ b/x-pack/filebeat/input/default-inputs/inputs_windows.go @@ -21,6 +21,7 @@ import ( "github.com/elastic/beats/v7/x-pack/filebeat/input/http_endpoint" "github.com/elastic/beats/v7/x-pack/filebeat/input/httpjson" "github.com/elastic/beats/v7/x-pack/filebeat/input/lumberjack" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow" "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit" "github.com/elastic/beats/v7/x-pack/filebeat/input/shipper" "github.com/elastic/elastic-agent-libs/logp" @@ -41,5 +42,6 @@ func xpackInputs(info beat.Info, log *logp.Logger, store beater.StateStore) []v2 lumberjack.Plugin(), shipper.Plugin(log, store), etw.Plugin(), + netflow.Plugin(log), } } From 3feaab2c02d2bc4a589935c45c95eb574fefab3d Mon Sep 17 00:00:00 2001 From: Taylor Swanson Date: Mon, 22 Apr 2024 09:08:10 -0500 Subject: [PATCH 2/2] Fixup changelog --- CHANGELOG.next.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index c9d0f8127736..0017c677560c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -136,7 +136,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Fix config validation for CEL and HTTPJSON inputs when using password grant authentication and `client.id` or `client.secret` are not present. {pull}38962[38962] - Updated Websocket input title to align with existing inputs {pull}39006[39006] - Restore netflow input on Windows {pull}39024[39024] -- Upgrade azure-event-hubs-go and azure-storage-blob-go dependencies. {pull}38861[38861] *Heartbeat*