From 10dd5cc3ee3390f3bc0c2073deef0a161370b8df Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 07:46:46 -0500 Subject: [PATCH] [8.13](backport #39024) [netflow] Restore netflow input on Windows (#39059) * [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) --------- Co-authored-by: Taylor Swanson <90622908+taylor-swanson@users.noreply.github.com> Co-authored-by: Taylor Swanson --- CHANGELOG.next.asciidoc | 1 + x-pack/filebeat/input/default-inputs/inputs_windows.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index ecc53958027..0e373c7b588 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -78,6 +78,7 @@ 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] - [threatintel] MISP splitting fix for empty responses {issue}38739[38739] {pull}38917[38917] +- Restore netflow input on Windows {pull}39024[39024] *Heartbeat* diff --git a/x-pack/filebeat/input/default-inputs/inputs_windows.go b/x-pack/filebeat/input/default-inputs/inputs_windows.go index 361883f39ad..821131c8bc2 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), } }