From 683f45cce6320068fc667f2dfd308ed0abca37e6 Mon Sep 17 00:00:00 2001 From: Taylor Swanson Date: Wed, 17 Apr 2024 14:45:37 -0500 Subject: [PATCH 1/2] [netflow] Restore netflow input on Windows - In 8.13, the netflow was accidentally removed from the list of inputs for Windows. This restores netflow as an input under Windows. --- 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 16af0b1a6526..cda76429870a 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -134,6 +134,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Prevent GCP Pub/Sub input blockage by increasing default value of `max_outstanding_messages` {issue}35029[35029] {pull}38985[38985] - 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}1[1] *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 1bb9e4c2959654d0b03e3b8c8c264d34bfaee3b3 Mon Sep 17 00:00:00 2001 From: Taylor Swanson Date: Wed, 17 Apr 2024 15:41:43 -0500 Subject: [PATCH 2/2] changelog --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index cda76429870a..06ffc811c8ed 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -134,7 +134,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Prevent GCP Pub/Sub input blockage by increasing default value of `max_outstanding_messages` {issue}35029[35029] {pull}38985[38985] - 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}1[1] +- Restore netflow input on Windows {pull}39024[39024] *Heartbeat*