From 23cf3a5ec8c6df3aeb1630115eca5967da2f9c89 Mon Sep 17 00:00:00 2001 From: Ishleen Kaur Date: Fri, 22 Sep 2023 12:00:35 +0530 Subject: [PATCH 01/14] Update null checks anf if checks in the rename --- packages/gcp/changelog.yml | 5 +++++ .../audit/elasticsearch/ingest_pipeline/default.yml | 1 + .../dns/elasticsearch/ingest_pipeline/default.yml | 1 + .../firewall/elasticsearch/ingest_pipeline/default.yml | 1 + .../elasticsearch/ingest_pipeline/default.yml | 1 + .../vpcflow/elasticsearch/ingest_pipeline/default.yml | 1 + packages/gcp/manifest.yml | 2 +- 7 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/gcp/changelog.yml b/packages/gcp/changelog.yml index dcbfff9e3e91..968368759ff2 100644 --- a/packages/gcp/changelog.yml +++ b/packages/gcp/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.29.1" + changes: + - description: Add null checks and ignore_missing checks to the rename processor + type: bugfix + link: https://github.com/elastic/integrations/pull/1234 - version: "2.29.0" changes: - description: Remove GCP CloudSQL deprecated, alpha or beta metrics and fix field types. diff --git a/packages/gcp/data_stream/audit/elasticsearch/ingest_pipeline/default.yml b/packages/gcp/data_stream/audit/elasticsearch/ingest_pipeline/default.yml index a738b0ee4915..5a78745ec68e 100644 --- a/packages/gcp/data_stream/audit/elasticsearch/ingest_pipeline/default.yml +++ b/packages/gcp/data_stream/audit/elasticsearch/ingest_pipeline/default.yml @@ -9,6 +9,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/gcp/data_stream/dns/elasticsearch/ingest_pipeline/default.yml b/packages/gcp/data_stream/dns/elasticsearch/ingest_pipeline/default.yml index 493ceedbf246..0d136073125d 100644 --- a/packages/gcp/data_stream/dns/elasticsearch/ingest_pipeline/default.yml +++ b/packages/gcp/data_stream/dns/elasticsearch/ingest_pipeline/default.yml @@ -8,6 +8,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/gcp/data_stream/firewall/elasticsearch/ingest_pipeline/default.yml b/packages/gcp/data_stream/firewall/elasticsearch/ingest_pipeline/default.yml index b13030937908..b20cd1137ad6 100644 --- a/packages/gcp/data_stream/firewall/elasticsearch/ingest_pipeline/default.yml +++ b/packages/gcp/data_stream/firewall/elasticsearch/ingest_pipeline/default.yml @@ -9,6 +9,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/gcp/data_stream/loadbalancing_logs/elasticsearch/ingest_pipeline/default.yml b/packages/gcp/data_stream/loadbalancing_logs/elasticsearch/ingest_pipeline/default.yml index 58747ecf7ba8..2775699dc991 100644 --- a/packages/gcp/data_stream/loadbalancing_logs/elasticsearch/ingest_pipeline/default.yml +++ b/packages/gcp/data_stream/loadbalancing_logs/elasticsearch/ingest_pipeline/default.yml @@ -9,6 +9,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/gcp/data_stream/vpcflow/elasticsearch/ingest_pipeline/default.yml b/packages/gcp/data_stream/vpcflow/elasticsearch/ingest_pipeline/default.yml index d818638857f0..dd52090f93b3 100644 --- a/packages/gcp/data_stream/vpcflow/elasticsearch/ingest_pipeline/default.yml +++ b/packages/gcp/data_stream/vpcflow/elasticsearch/ingest_pipeline/default.yml @@ -9,6 +9,7 @@ processors: field: message target_field: event.original ignore_missing: true + if: 'ctx.event?.original == null' - json: field: event.original target_field: json diff --git a/packages/gcp/manifest.yml b/packages/gcp/manifest.yml index b3b2e70b01a4..981c64a61f74 100644 --- a/packages/gcp/manifest.yml +++ b/packages/gcp/manifest.yml @@ -1,6 +1,6 @@ name: gcp title: Google Cloud Platform -version: "2.29.0" +version: "2.29.1" description: Collect logs and metrics from Google Cloud Platform with Elastic Agent. type: integration icons: From 9bcd85d46ab20c6e9ccc179f94e15bd7b3b26b5f Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 22 Sep 2023 12:05:41 +0530 Subject: [PATCH 02/14] Update changelog.yml --- packages/gcp/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gcp/changelog.yml b/packages/gcp/changelog.yml index 968368759ff2..74206ba9c9a0 100644 --- a/packages/gcp/changelog.yml +++ b/packages/gcp/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Add null checks and ignore_missing checks to the rename processor type: bugfix - link: https://github.com/elastic/integrations/pull/1234 + link: https://github.com/elastic/integrations/pull/7934 - version: "2.29.0" changes: - description: Remove GCP CloudSQL deprecated, alpha or beta metrics and fix field types. From 0de168bcb448301aa28f4eb2b6e6e680623af089 Mon Sep 17 00:00:00 2001 From: ishleenk17 Date: Wed, 10 Apr 2024 16:14:56 +0530 Subject: [PATCH 03/14] Add harvester limit to the logs --- packages/apache_tomcat/changelog.yml | 5 +++++ .../data_stream/access/agent/stream/filestream.yml.hbs | 4 ++++ packages/apache_tomcat/data_stream/access/manifest.yml | 7 +++++++ .../data_stream/catalina/agent/stream/filestream.yml.hbs | 4 ++++ packages/apache_tomcat/data_stream/catalina/manifest.yml | 7 +++++++ .../data_stream/localhost/agent/stream/filestream.yml.hbs | 4 ++++ packages/apache_tomcat/data_stream/localhost/manifest.yml | 7 +++++++ packages/apache_tomcat/manifest.yml | 2 +- 8 files changed, 39 insertions(+), 1 deletion(-) diff --git a/packages/apache_tomcat/changelog.yml b/packages/apache_tomcat/changelog.yml index 9bbc5974ce48..f0efff71d68c 100644 --- a/packages/apache_tomcat/changelog.yml +++ b/packages/apache_tomcat/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.5.0" + changes: + - description: Add the configuration option for harvester_limit + type: enhancement + link: https://github.com/elastic/integrations/pull/1234 - version: "1.4.0" changes: - description: Enable secrets for sensitive fields. For more details, refer https://www.elastic.co/guide/en/fleet/current/agent-policy.html#agent-policy-secret-values diff --git a/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs b/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs index df42afc3c097..2b6a18944e2f 100644 --- a/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs +++ b/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs @@ -17,3 +17,7 @@ publisher_pipeline.disable_host: true processors: {{processors}} {{/if}} +{{#if harvester_limit}} +harvester_limit: +{{harvester_limit}} +{{/if}} diff --git a/packages/apache_tomcat/data_stream/access/manifest.yml b/packages/apache_tomcat/data_stream/access/manifest.yml index 2670a5d0aa7b..579305b1728f 100644 --- a/packages/apache_tomcat/data_stream/access/manifest.yml +++ b/packages/apache_tomcat/data_stream/access/manifest.yml @@ -36,6 +36,13 @@ streams: required: false show_user: false description: Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/fleet/current/elastic-agent-processor-configuration.html) for details. + - name: harvester_limit + type: integer + title: Harvester Limit + description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html_)." + required: false + show_user: false + default: 0 template_path: filestream.yml.hbs title: Apache Tomcat Access logs description: Collect Apache Tomcat Access logs. diff --git a/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs b/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs index ec3586155515..0b97dc9ea7d6 100644 --- a/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs +++ b/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs @@ -17,6 +17,10 @@ publisher_pipeline.disable_host: true processors: {{processors}} {{/if}} +{{#if harvester_limit}} +harvester_limit: +{{harvester_limit}} +{{/if}} {{#if tz_offset}} fields_under_root: true fields: diff --git a/packages/apache_tomcat/data_stream/catalina/manifest.yml b/packages/apache_tomcat/data_stream/catalina/manifest.yml index 39cd2c1afdd1..ae7d81f20d9d 100644 --- a/packages/apache_tomcat/data_stream/catalina/manifest.yml +++ b/packages/apache_tomcat/data_stream/catalina/manifest.yml @@ -45,6 +45,13 @@ streams: required: false show_user: false description: Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/fleet/current/elastic-agent-processor-configuration.html) for details. + - name: harvester_limit + type: integer + title: Harvester Limit + description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html_)." + required: false + show_user: false + default: 0 - name: parsers type: yaml title: Parsers diff --git a/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs b/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs index ec3586155515..0b97dc9ea7d6 100644 --- a/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs +++ b/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs @@ -17,6 +17,10 @@ publisher_pipeline.disable_host: true processors: {{processors}} {{/if}} +{{#if harvester_limit}} +harvester_limit: +{{harvester_limit}} +{{/if}} {{#if tz_offset}} fields_under_root: true fields: diff --git a/packages/apache_tomcat/data_stream/localhost/manifest.yml b/packages/apache_tomcat/data_stream/localhost/manifest.yml index 4bfa86e3b2ef..2192eb1210bd 100644 --- a/packages/apache_tomcat/data_stream/localhost/manifest.yml +++ b/packages/apache_tomcat/data_stream/localhost/manifest.yml @@ -45,6 +45,13 @@ streams: required: false show_user: false description: Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/fleet/current/elastic-agent-processor-configuration.html) for details. + - name: harvester_limit + type: integer + title: Harvester Limit + description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html_)." + required: false + show_user: false + default: 0 - name: parsers type: yaml title: Parsers diff --git a/packages/apache_tomcat/manifest.yml b/packages/apache_tomcat/manifest.yml index 82cc50383321..1294b00064e6 100644 --- a/packages/apache_tomcat/manifest.yml +++ b/packages/apache_tomcat/manifest.yml @@ -1,7 +1,7 @@ format_version: "3.0.2" name: apache_tomcat title: Apache Tomcat -version: "1.4.0" +version: "1.5.0" description: Collect and parse logs and metrics from Apache Tomcat servers with Elastic Agent. categories: ["web", "observability"] type: integration From 1538cb6952adcfa8c83ef4f830e0e9ddfbd92946 Mon Sep 17 00:00:00 2001 From: ishleenk17 Date: Wed, 10 Apr 2024 16:39:10 +0530 Subject: [PATCH 04/14] Update PR --- packages/apache_tomcat/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache_tomcat/changelog.yml b/packages/apache_tomcat/changelog.yml index f0efff71d68c..fe5a8f9b4562 100644 --- a/packages/apache_tomcat/changelog.yml +++ b/packages/apache_tomcat/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Add the configuration option for harvester_limit type: enhancement - link: https://github.com/elastic/integrations/pull/1234 + link: https://github.com/elastic/integrations/pull/9558 - version: "1.4.0" changes: - description: Enable secrets for sensitive fields. For more details, refer https://www.elastic.co/guide/en/fleet/current/agent-policy.html#agent-policy-secret-values From 6b777f632071d4ea3a2116085e5631456d87a7a5 Mon Sep 17 00:00:00 2001 From: ishleenk17 Date: Fri, 12 Apr 2024 11:05:32 +0530 Subject: [PATCH 05/14] Update broken link --- packages/apache_tomcat/data_stream/access/manifest.yml | 2 +- packages/apache_tomcat/data_stream/catalina/manifest.yml | 2 +- packages/apache_tomcat/data_stream/localhost/manifest.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apache_tomcat/data_stream/access/manifest.yml b/packages/apache_tomcat/data_stream/access/manifest.yml index 579305b1728f..fcdb73467f37 100644 --- a/packages/apache_tomcat/data_stream/access/manifest.yml +++ b/packages/apache_tomcat/data_stream/access/manifest.yml @@ -39,7 +39,7 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html_)." + description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html#filebeat-input-log-harvester-limit)." required: false show_user: false default: 0 diff --git a/packages/apache_tomcat/data_stream/catalina/manifest.yml b/packages/apache_tomcat/data_stream/catalina/manifest.yml index ae7d81f20d9d..2b6e8190ac7a 100644 --- a/packages/apache_tomcat/data_stream/catalina/manifest.yml +++ b/packages/apache_tomcat/data_stream/catalina/manifest.yml @@ -48,7 +48,7 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html_)." + description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html#filebeat-input-log-harvester-limit)." required: false show_user: false default: 0 diff --git a/packages/apache_tomcat/data_stream/localhost/manifest.yml b/packages/apache_tomcat/data_stream/localhost/manifest.yml index 2192eb1210bd..06fe999c4c32 100644 --- a/packages/apache_tomcat/data_stream/localhost/manifest.yml +++ b/packages/apache_tomcat/data_stream/localhost/manifest.yml @@ -48,7 +48,7 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html_)." + description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html#filebeat-input-log-harvester-limit)." required: false show_user: false default: 0 From 2c674b31254965eaaabb4fd717587250ea831f20 Mon Sep 17 00:00:00 2001 From: ishleenk17 Date: Tue, 7 May 2024 17:31:16 +0530 Subject: [PATCH 06/14] Add file handling closure --- .../access/agent/stream/filestream.yml.hbs | 4 ++++ .../apache_tomcat/data_stream/access/manifest.yml | 11 ++++++++++- .../catalina/agent/stream/filestream.yml.hbs | 3 +++ .../apache_tomcat/data_stream/catalina/manifest.yml | 8 ++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs b/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs index 2b6a18944e2f..02bda8402a6a 100644 --- a/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs +++ b/packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs @@ -21,3 +21,7 @@ processors: harvester_limit: {{harvester_limit}} {{/if}} +{{#if close.on_state_change.inactive}} +close.on_state_change.inactive: +{{/if}} + diff --git a/packages/apache_tomcat/data_stream/access/manifest.yml b/packages/apache_tomcat/data_stream/access/manifest.yml index fcdb73467f37..cd06c98a7aa7 100644 --- a/packages/apache_tomcat/data_stream/access/manifest.yml +++ b/packages/apache_tomcat/data_stream/access/manifest.yml @@ -39,10 +39,19 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html#filebeat-input-log-harvester-limit)." + description: "Limits the number of harvesters that are started in parallel." required: false show_user: false default: 0 + - name: close.on_state_change.inactive + type: text + title: File Handle Closure duration + description: The duration after which the file handle is closed if the file has not been harvested. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive) + multi: false + required: false + show_user: false + default: 5m + template_path: filestream.yml.hbs title: Apache Tomcat Access logs description: Collect Apache Tomcat Access logs. diff --git a/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs b/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs index 0b97dc9ea7d6..b23d471c8660 100644 --- a/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs +++ b/packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs @@ -21,6 +21,9 @@ processors: harvester_limit: {{harvester_limit}} {{/if}} +{{#if close.on_state_change.inactive}} +close.on_state_change.inactive: +{{/if}} {{#if tz_offset}} fields_under_root: true fields: diff --git a/packages/apache_tomcat/data_stream/catalina/manifest.yml b/packages/apache_tomcat/data_stream/catalina/manifest.yml index 2b6e8190ac7a..8bbbbded7972 100644 --- a/packages/apache_tomcat/data_stream/catalina/manifest.yml +++ b/packages/apache_tomcat/data_stream/catalina/manifest.yml @@ -52,6 +52,14 @@ streams: required: false show_user: false default: 0 + - name: close.on_state_change.inactive + type: text + title: File Handle Closure duration + description: The duration after which the file handle is closed if the file has not been harvested. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive) + multi: false + required: false + show_user: false + default: 5m - name: parsers type: yaml title: Parsers From 55606d75f8b0f473eb0ade0f6ee8b8a639c29e34 Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Mon, 13 May 2024 12:57:09 +0530 Subject: [PATCH 07/14] Update packages/apache_tomcat/data_stream/access/manifest.yml Co-authored-by: Tiago Queiroz --- packages/apache_tomcat/data_stream/access/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/access/manifest.yml b/packages/apache_tomcat/data_stream/access/manifest.yml index cd06c98a7aa7..f3cf3e48754c 100644 --- a/packages/apache_tomcat/data_stream/access/manifest.yml +++ b/packages/apache_tomcat/data_stream/access/manifest.yml @@ -46,7 +46,7 @@ streams: - name: close.on_state_change.inactive type: text title: File Handle Closure duration - description: The duration after which the file handle is closed if the file has not been harvested. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive) + description: The duration after which the file handle is closed if the file has not been updated. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive). multi: false required: false show_user: false From 5b6fd02da493a291e5e8bdca06f59524ed358768 Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Mon, 13 May 2024 12:58:11 +0530 Subject: [PATCH 08/14] Update manifest.yml --- packages/apache_tomcat/data_stream/catalina/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/catalina/manifest.yml b/packages/apache_tomcat/data_stream/catalina/manifest.yml index 8bbbbded7972..27bdeac50cc9 100644 --- a/packages/apache_tomcat/data_stream/catalina/manifest.yml +++ b/packages/apache_tomcat/data_stream/catalina/manifest.yml @@ -55,7 +55,7 @@ streams: - name: close.on_state_change.inactive type: text title: File Handle Closure duration - description: The duration after which the file handle is closed if the file has not been harvested. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive) + description: The duration after which the file handle is closed if the file has not been updated. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive) multi: false required: false show_user: false From 48a24de4b884983c9aa2e791f998619a4ec2b7f6 Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 17 May 2024 10:01:53 +0530 Subject: [PATCH 09/14] Update packages/apache_tomcat/data_stream/access/manifest.yml Co-authored-by: Tiago Queiroz --- packages/apache_tomcat/data_stream/access/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/access/manifest.yml b/packages/apache_tomcat/data_stream/access/manifest.yml index f3cf3e48754c..dc6d5860c6a7 100644 --- a/packages/apache_tomcat/data_stream/access/manifest.yml +++ b/packages/apache_tomcat/data_stream/access/manifest.yml @@ -39,7 +39,7 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of harvesters that are started in parallel." + description: "Limits the number of files that are ingested in parallel." required: false show_user: false default: 0 From 01fbb51ed29d4615a83fcd5ed5ab53711828974b Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 17 May 2024 10:02:02 +0530 Subject: [PATCH 10/14] Update packages/apache_tomcat/data_stream/access/manifest.yml Co-authored-by: Richa Talwar <102972658+ritalwar@users.noreply.github.com> --- packages/apache_tomcat/data_stream/access/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/access/manifest.yml b/packages/apache_tomcat/data_stream/access/manifest.yml index dc6d5860c6a7..87303b59480e 100644 --- a/packages/apache_tomcat/data_stream/access/manifest.yml +++ b/packages/apache_tomcat/data_stream/access/manifest.yml @@ -45,7 +45,7 @@ streams: default: 0 - name: close.on_state_change.inactive type: text - title: File Handle Closure duration + title: File Handle Closure Duration description: The duration after which the file handle is closed if the file has not been updated. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive). multi: false required: false From ca557ed2b79580dc1efd916e3199071ac73e2e15 Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 17 May 2024 10:02:54 +0530 Subject: [PATCH 11/14] Update manifest.yml --- packages/apache_tomcat/data_stream/catalina/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/catalina/manifest.yml b/packages/apache_tomcat/data_stream/catalina/manifest.yml index 27bdeac50cc9..d31f619dbd50 100644 --- a/packages/apache_tomcat/data_stream/catalina/manifest.yml +++ b/packages/apache_tomcat/data_stream/catalina/manifest.yml @@ -48,7 +48,7 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html#filebeat-input-log-harvester-limit)." + description: Limits the number of harvesters that are started in parallel. required: false show_user: false default: 0 From b2159d35af596219183b64ae748c45eb27704c0a Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 17 May 2024 10:04:08 +0530 Subject: [PATCH 12/14] Update manifest.yml --- packages/apache_tomcat/data_stream/access/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/access/manifest.yml b/packages/apache_tomcat/data_stream/access/manifest.yml index 87303b59480e..eb72ce512045 100644 --- a/packages/apache_tomcat/data_stream/access/manifest.yml +++ b/packages/apache_tomcat/data_stream/access/manifest.yml @@ -39,7 +39,7 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of files that are ingested in parallel." + description: Limits the number of files that are ingested in parallel. required: false show_user: false default: 0 From 147e41675adca1a36beb61158469c9668b6c44aa Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 17 May 2024 10:05:18 +0530 Subject: [PATCH 13/14] Update manifest.yml --- .../apache_tomcat/data_stream/localhost/manifest.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/apache_tomcat/data_stream/localhost/manifest.yml b/packages/apache_tomcat/data_stream/localhost/manifest.yml index 06fe999c4c32..4f9e2631ed2b 100644 --- a/packages/apache_tomcat/data_stream/localhost/manifest.yml +++ b/packages/apache_tomcat/data_stream/localhost/manifest.yml @@ -48,10 +48,17 @@ streams: - name: harvester_limit type: integer title: Harvester Limit - description: "Limits the number of harvesters that are started in parallel. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-log.html#filebeat-input-log-harvester-limit)." + description: Limits the number of harvesters that are started in parallel. required: false show_user: false default: 0 + - name: close.on_state_change.inactive + type: text + title: File Handle Closure duration + description: The duration after which the file handle is closed if the file has not been updated. More details [here](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-close-inactive) + multi: false + required: false + show_user: false - name: parsers type: yaml title: Parsers From 76902f0b550dc73bbc72ccb1e63ea4c85f09c18b Mon Sep 17 00:00:00 2001 From: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com> Date: Fri, 17 May 2024 10:05:41 +0530 Subject: [PATCH 14/14] Update filestream.yml.hbs --- .../data_stream/localhost/agent/stream/filestream.yml.hbs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs b/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs index 0b97dc9ea7d6..b23d471c8660 100644 --- a/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs +++ b/packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs @@ -21,6 +21,9 @@ processors: harvester_limit: {{harvester_limit}} {{/if}} +{{#if close.on_state_change.inactive}} +close.on_state_change.inactive: +{{/if}} {{#if tz_offset}} fields_under_root: true fields: