Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Harvester Limit to the Apache Tomcat Logs #9558

Merged
merged 29 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
23cf3a5
Update null checks anf if checks in the rename
ishleenk17 Sep 22, 2023
9bcd85d
Update changelog.yml
ishleenk17 Sep 22, 2023
1462704
Merge branch 'elastic:main' into main
ishleenk17 Sep 25, 2023
3bfa4f3
Merge branch 'elastic:main' into main
ishleenk17 Oct 12, 2023
7df11eb
Merge branch 'elastic:main' into main
ishleenk17 Oct 20, 2023
9f4a04a
Merge branch 'elastic:main' into main
ishleenk17 Oct 26, 2023
58330e6
Merge branch 'elastic:main' into main
ishleenk17 Oct 30, 2023
5c5a7eb
Merge branch 'elastic:main' into main
ishleenk17 Nov 30, 2023
8e5e367
Merge branch 'elastic:main' into main
ishleenk17 Jan 3, 2024
56e3d83
Merge branch 'elastic:main' into main
ishleenk17 Jan 9, 2024
3be9458
Merge branch 'elastic:main' into main
ishleenk17 Jan 11, 2024
e97f93c
Merge branch 'elastic:main' into main
ishleenk17 Jan 16, 2024
c6afaab
Merge branch 'elastic:main' into main
ishleenk17 Jan 19, 2024
feac62a
Merge branch 'elastic:main' into main
ishleenk17 Jan 25, 2024
e901508
Merge branch 'elastic:main' into main
ishleenk17 Apr 3, 2024
fcc7361
Merge branch 'elastic:main' into main
ishleenk17 Apr 8, 2024
3ed8f2d
Merge branch 'elastic:main' into main
ishleenk17 Apr 10, 2024
0de168b
Add harvester limit to the logs
ishleenk17 Apr 10, 2024
1538cb6
Update PR
ishleenk17 Apr 10, 2024
6b777f6
Update broken link
ishleenk17 Apr 12, 2024
2c674b3
Add file handling closure
ishleenk17 May 7, 2024
55606d7
Update packages/apache_tomcat/data_stream/access/manifest.yml
ishleenk17 May 13, 2024
5b6fd02
Update manifest.yml
ishleenk17 May 13, 2024
48a24de
Update packages/apache_tomcat/data_stream/access/manifest.yml
ishleenk17 May 17, 2024
01fbb51
Update packages/apache_tomcat/data_stream/access/manifest.yml
ishleenk17 May 17, 2024
ca557ed
Update manifest.yml
ishleenk17 May 17, 2024
b2159d3
Update manifest.yml
ishleenk17 May 17, 2024
147e416
Update manifest.yml
ishleenk17 May 17, 2024
76902f0
Update filestream.yml.hbs
ishleenk17 May 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/apache_tomcat/changelog.yml
Original file line number Diff line number Diff line change
@@ -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/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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,11 @@ publisher_pipeline.disable_host: true
processors:
{{processors}}
{{/if}}
{{#if harvester_limit}}
harvester_limit:
{{harvester_limit}}
{{/if}}
{{#if close.on_state_change.inactive}}
close.on_state_change.inactive:
{{/if}}

16 changes: 16 additions & 0 deletions packages/apache_tomcat/data_stream/access/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ 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 files that are ingested 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
default: 5m

template_path: filestream.yml.hbs
title: Apache Tomcat Access logs
description: Collect Apache Tomcat Access logs.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ publisher_pipeline.disable_host: true
processors:
{{processors}}
{{/if}}
{{#if harvester_limit}}
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:
Expand Down
15 changes: 15 additions & 0 deletions packages/apache_tomcat/data_stream/catalina/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,21 @@ 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.
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
default: 5m
- name: parsers
type: yaml
title: Parsers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ publisher_pipeline.disable_host: true
processors:
{{processors}}
{{/if}}
{{#if harvester_limit}}
harvester_limit:
{{harvester_limit}}
{{/if}}
ishleenk17 marked this conversation as resolved.
Show resolved Hide resolved
{{#if close.on_state_change.inactive}}
close.on_state_change.inactive:
{{/if}}
{{#if tz_offset}}
fields_under_root: true
fields:
Expand Down
14 changes: 14 additions & 0 deletions packages/apache_tomcat/data_stream/localhost/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,20 @@ 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.
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
Expand Down
2 changes: 1 addition & 1 deletion packages/apache_tomcat/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down