diff --git a/packages/goflow2/changelog.yml b/packages/goflow2/changelog.yml index 1585baf2cb5..23e1ba82517 100644 --- a/packages/goflow2/changelog.yml +++ b/packages/goflow2/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.2.0" + changes: + - description: Add configuration for custom filestream options. Ensure filestream fingerprint is disabled in system test. + type: enhancement + link: https://github.com/elastic/integrations/pull/12349 - version: "0.1.1" changes: - description: Use triple-brace Mustache templating when referencing variables in ingest pipelines. diff --git a/packages/goflow2/data_stream/sflow/_dev/test/system/test-filestream-config.yml b/packages/goflow2/data_stream/sflow/_dev/test/system/test-filestream-config.yml index 5f96eea2ea7..602ce0cd819 100644 --- a/packages/goflow2/data_stream/sflow/_dev/test/system/test-filestream-config.yml +++ b/packages/goflow2/data_stream/sflow/_dev/test/system/test-filestream-config.yml @@ -6,5 +6,10 @@ data_stream: preserve_original_event: true paths: - "{{{SERVICE_LOGS_DIR}}}/*goflow2-sflow*.log" + filestream_options: |- + file_identity.native: ~ + prospector: + scanner: + fingerprint.enabled: false assert: hit_count: 9 diff --git a/packages/goflow2/data_stream/sflow/agent/stream/filestream.yml.hbs b/packages/goflow2/data_stream/sflow/agent/stream/filestream.yml.hbs index 87d16c52999..fa2eb58f26f 100644 --- a/packages/goflow2/data_stream/sflow/agent/stream/filestream.yml.hbs +++ b/packages/goflow2/data_stream/sflow/agent/stream/filestream.yml.hbs @@ -31,4 +31,7 @@ processors: {{/if}} {{#if ignore_older}} ignore_older: {{ignore_older}} -{{/if}} \ No newline at end of file +{{/if}} +{{#if filestream_options}} +{{filestream_options}} +{{/if}} diff --git a/packages/goflow2/data_stream/sflow/manifest.yml b/packages/goflow2/data_stream/sflow/manifest.yml index 2a4ad560aea..e591b132cce 100644 --- a/packages/goflow2/data_stream/sflow/manifest.yml +++ b/packages/goflow2/data_stream/sflow/manifest.yml @@ -49,6 +49,13 @@ streams: default: - sflow - forwarded + - name: filestream_options + type: yaml + title: Custom Filestream Options + multi: false + required: false + show_user: false + description: Specify custom configuration options for the Filestream input. See [filestream input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html) for details. - name: processors type: yaml title: Processors diff --git a/packages/goflow2/manifest.yml b/packages/goflow2/manifest.yml index d38c299d765..3a6774c9ee4 100644 --- a/packages/goflow2/manifest.yml +++ b/packages/goflow2/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.2.1 name: goflow2 title: "GoFlow2 logs" -version: 0.1.1 +version: 0.2.0 description: "Collect logs from goflow2 with Elastic Agent." type: integration categories: diff --git a/packages/imperva/changelog.yml b/packages/imperva/changelog.yml index 0c57bdd02e8..cda422c51f3 100644 --- a/packages/imperva/changelog.yml +++ b/packages/imperva/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.2.0" + changes: + - description: Add configuration for custom filestream options. Ensure filestream fingerprint is disabled in system test. + type: enhancement + link: https://github.com/elastic/integrations/pull/12349 - version: "1.1.0" changes: - description: Update package spec to 3.0.3. diff --git a/packages/imperva/data_stream/securesphere/_dev/test/system/test-logfile-config.yml b/packages/imperva/data_stream/securesphere/_dev/test/system/test-logfile-config.yml index fa61af5ec81..0f598fdca11 100644 --- a/packages/imperva/data_stream/securesphere/_dev/test/system/test-logfile-config.yml +++ b/packages/imperva/data_stream/securesphere/_dev/test/system/test-logfile-config.yml @@ -6,6 +6,11 @@ data_stream: - "{{SERVICE_LOGS_DIR}}/*imperva*.log" preserve_original_event: true preserve_duplicate_custom_fields: true + filestream_options: |- + file_identity.native: ~ + prospector: + scanner: + fingerprint.enabled: false numeric_keyword_fields: - log.file.device_id - log.file.inode diff --git a/packages/imperva/data_stream/securesphere/agent/stream/filestream.yml.hbs b/packages/imperva/data_stream/securesphere/agent/stream/filestream.yml.hbs index f8064ace747..ce779ba120b 100644 --- a/packages/imperva/data_stream/securesphere/agent/stream/filestream.yml.hbs +++ b/packages/imperva/data_stream/securesphere/agent/stream/filestream.yml.hbs @@ -32,3 +32,6 @@ fields: processors: {{processors}} {{/if}} +{{#if filestream_options}} +{{filestream_options}} +{{/if}} diff --git a/packages/imperva/data_stream/securesphere/manifest.yml b/packages/imperva/data_stream/securesphere/manifest.yml index 370f472eda9..b2c92a9bf78 100644 --- a/packages/imperva/data_stream/securesphere/manifest.yml +++ b/packages/imperva/data_stream/securesphere/manifest.yml @@ -222,6 +222,13 @@ streams: type: bool multi: false default: false + - name: filestream_options + type: yaml + title: Custom Filestream Options + multi: false + required: false + show_user: false + description: Specify custom configuration options for the Filestream input. See [filestream input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html) for details. - name: processors type: yaml title: Processors diff --git a/packages/imperva/manifest.yml b/packages/imperva/manifest.yml index d201b15d58b..5b293e7ebe4 100644 --- a/packages/imperva/manifest.yml +++ b/packages/imperva/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.0.3 name: imperva title: Imperva -version: "1.1.0" +version: "1.2.0" description: Collect logs from Imperva devices with Elastic Agent. categories: ["network", "security"] type: integration diff --git a/packages/proxysg/changelog.yml b/packages/proxysg/changelog.yml index 665e90649d8..9080b709feb 100644 --- a/packages/proxysg/changelog.yml +++ b/packages/proxysg/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: 0.4.0 + changes: + - description: Add configuration for custom filestream options. Ensure filestream fingerprint is disabled in system test. + type: enhancement + link: https://github.com/elastic/integrations/pull/12349 - version: 0.3.1 changes: - description: Add format config to all inputs diff --git a/packages/proxysg/data_stream/log/_dev/test/system/test-logfile-config.yml b/packages/proxysg/data_stream/log/_dev/test/system/test-logfile-config.yml index 20402c29972..0340355976f 100644 --- a/packages/proxysg/data_stream/log/_dev/test/system/test-logfile-config.yml +++ b/packages/proxysg/data_stream/log/_dev/test/system/test-logfile-config.yml @@ -4,5 +4,10 @@ data_stream: vars: paths: - "{{SERVICE_LOGS_DIR}}/proxysg.log" + filestream_options: |- + file_identity.native: ~ + prospector: + scanner: + fingerprint.enabled: false assert: hit_count: 5 diff --git a/packages/proxysg/data_stream/log/agent/stream/stream.yml.hbs b/packages/proxysg/data_stream/log/agent/stream/stream.yml.hbs index d9fe9aa68ab..5827201c32d 100644 --- a/packages/proxysg/data_stream/log/agent/stream/stream.yml.hbs +++ b/packages/proxysg/data_stream/log/agent/stream/stream.yml.hbs @@ -22,3 +22,6 @@ processors: {{#if processors}} {{processors}} {{/if}} +{{#if filestream_options}} +{{filestream_options}} +{{/if}} diff --git a/packages/proxysg/data_stream/log/manifest.yml b/packages/proxysg/data_stream/log/manifest.yml index 83935e99d37..bc7d13830a8 100644 --- a/packages/proxysg/data_stream/log/manifest.yml +++ b/packages/proxysg/data_stream/log/manifest.yml @@ -49,6 +49,13 @@ streams: required: true show_user: true + - name: filestream_options + type: yaml + title: Custom Filestream Options + multi: false + required: false + show_user: false + description: Specify custom configuration options for the Filestream input. See [filestream input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html) for details. - name: processors type: yaml title: Processors diff --git a/packages/proxysg/manifest.yml b/packages/proxysg/manifest.yml index 35e836b5356..3cf36bad4b0 100644 --- a/packages/proxysg/manifest.yml +++ b/packages/proxysg/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.1.1 name: proxysg title: "Broadcom ProxySG" -version: 0.3.1 +version: 0.4.0 source: license: "Elastic-2.0" description: "Collect access logs from Broadcom ProxySG with Elastic Agent." diff --git a/packages/syslog_router/changelog.yml b/packages/syslog_router/changelog.yml index 4e604b4ec2c..d98bab7870e 100644 --- a/packages/syslog_router/changelog.yml +++ b/packages/syslog_router/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.1.1" + changes: + - description: Ensure filestream fingerprint is disabled in system test. + type: enhancement + link: https://github.com/elastic/integrations/pull/12349 - version: "0.1.0" changes: - description: Initial draft of the package diff --git a/packages/syslog_router/data_stream/log/_dev/test/system/test-filestream-config.yml b/packages/syslog_router/data_stream/log/_dev/test/system/test-filestream-config.yml index 82fdb06bc0d..5dad1da0a06 100644 --- a/packages/syslog_router/data_stream/log/_dev/test/system/test-filestream-config.yml +++ b/packages/syslog_router/data_stream/log/_dev/test/system/test-filestream-config.yml @@ -6,5 +6,10 @@ data_stream: paths: - "{{SERVICE_LOGS_DIR}}/*.log" preserve_original_event: true + filestream_options: |- + file_identity.native: ~ + prospector: + scanner: + fingerprint.enabled: false assert: hit_count: 1 diff --git a/packages/syslog_router/manifest.yml b/packages/syslog_router/manifest.yml index 2d88308ee64..673a65bfc12 100644 --- a/packages/syslog_router/manifest.yml +++ b/packages/syslog_router/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.2.1 name: syslog_router title: "Syslog Router" -version: 0.1.0 +version: 0.1.1 description: "Route syslog events to integrations with Elastic Agent." type: integration categories: