From 63b8bfa72b9a0c015beb58b3677f24cb80eca331 Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Fri, 6 Sep 2024 12:31:28 +0300 Subject: [PATCH 1/4] feat: add field to set the netflow read and decode workers --- packages/netflow/changelog.yml | 5 +++++ .../netflow/data_stream/log/agent/stream/netflow.yml.hbs | 1 + packages/netflow/data_stream/log/manifest.yml | 8 ++++++++ packages/netflow/manifest.yml | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/netflow/changelog.yml b/packages/netflow/changelog.yml index 0dd1b103954..d00fd43ae45 100644 --- a/packages/netflow/changelog.yml +++ b/packages/netflow/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.19.0" + changes: + - description: Add field to set the netflow read and decode workers + type: enhancement + link: https://github.com/elastic/integrations/pull/11025 - version: "2.18.0" changes: - description: Update package spec to 3.0.3. diff --git a/packages/netflow/data_stream/log/agent/stream/netflow.yml.hbs b/packages/netflow/data_stream/log/agent/stream/netflow.yml.hbs index c2d192f3c75..d3bd7eb71b7 100644 --- a/packages/netflow/data_stream/log/agent/stream/netflow.yml.hbs +++ b/packages/netflow/data_stream/log/agent/stream/netflow.yml.hbs @@ -1,6 +1,7 @@ protocols: [v1, v5, v6, v7, v8, v9, ipfix] host: '{{host}}:{{port}}' max_message_size: '{{max_message_size}}' +workers: {{workers}} expiration_timeout: '{{expiration_timeout}}' queue_size: {{queue_size}} {{#if timeout}} diff --git a/packages/netflow/data_stream/log/manifest.yml b/packages/netflow/data_stream/log/manifest.yml index 92cac61dfa2..2547ad76d0a 100644 --- a/packages/netflow/data_stream/log/manifest.yml +++ b/packages/netflow/data_stream/log/manifest.yml @@ -34,6 +34,14 @@ streams: multi: true required: false show_user: true + - name: workers + type: integer + title: Number of Workers + description: The number of workers to read and decode concurrently netflow packets. Note that in order to maximize the performance gains of multiple workers it is highly advised to switch the corresponding output to `throughput` preset + multi: false + required: false + show_user: false + default: 1 - name: queue_size type: integer title: Maximum number of packets that can be queued for processing diff --git a/packages/netflow/manifest.yml b/packages/netflow/manifest.yml index e26f96efbdd..4ea19548e98 100644 --- a/packages/netflow/manifest.yml +++ b/packages/netflow/manifest.yml @@ -1,7 +1,7 @@ format_version: "3.0.3" name: netflow title: NetFlow Records -version: "2.18.0" +version: "2.19.0" description: Collect flow records from NetFlow and IPFIX exporters with Elastic Agent. type: integration categories: From 12f4162c8fd92f141d32ac52ed62f5ce9e693a44 Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Thu, 7 Nov 2024 14:20:49 -0500 Subject: [PATCH 2/4] netflow/changelog.yml - add more context to message --- packages/netflow/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/netflow/changelog.yml b/packages/netflow/changelog.yml index 676ca740a4b..a1777867a3b 100644 --- a/packages/netflow/changelog.yml +++ b/packages/netflow/changelog.yml @@ -1,7 +1,7 @@ # newer versions go on top - version: "2.20.0" changes: - - description: Add field to set the netflow read and decode workers + - description: Add a new configuration option to control the number of NetFlow workers. This allows for the allocation of additional compute resources to read and decode NetFlow packets. type: enhancement link: https://github.com/elastic/integrations/pull/11025 - version: "2.19.1" From 6f08d00c3f7d90ac6a80724a7c0d2dd96c6a270f Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Thu, 7 Nov 2024 14:24:29 -0500 Subject: [PATCH 3/4] netflow/changelog.yml - indicate that 8.16 is needed The feature will only take effect if you have upgraded to elastic agent 8.16.0. Otherwise the setting is ignored. --- packages/netflow/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/netflow/changelog.yml b/packages/netflow/changelog.yml index a1777867a3b..d7c0f122af7 100644 --- a/packages/netflow/changelog.yml +++ b/packages/netflow/changelog.yml @@ -1,7 +1,7 @@ # newer versions go on top - version: "2.20.0" changes: - - description: Add a new configuration option to control the number of NetFlow workers. This allows for the allocation of additional compute resources to read and decode NetFlow packets. + - description: Add a new configuration option to control the number of NetFlow workers. This allows for the allocation of additional compute resources to read and decode NetFlow packets. The feature only takes effect under Elastic Agent 8.16 or greater. type: enhancement link: https://github.com/elastic/integrations/pull/11025 - version: "2.19.1" From e2191122fd956839d34fd026883224d8373a9f98 Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Thu, 7 Nov 2024 14:32:05 -0500 Subject: [PATCH 4/4] Improve readability of workers description --- packages/netflow/data_stream/log/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/netflow/data_stream/log/manifest.yml b/packages/netflow/data_stream/log/manifest.yml index 2547ad76d0a..5b7cbfd564b 100644 --- a/packages/netflow/data_stream/log/manifest.yml +++ b/packages/netflow/data_stream/log/manifest.yml @@ -37,7 +37,7 @@ streams: - name: workers type: integer title: Number of Workers - description: The number of workers to read and decode concurrently netflow packets. Note that in order to maximize the performance gains of multiple workers it is highly advised to switch the corresponding output to `throughput` preset + description: The number of workers to read and decode concurrently netflow packets. Note that in order to maximize the performance gains of multiple workers it is highly advised to switch the corresponding output to the `throughput` preset. multi: false required: false show_user: false