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.

Sign up for GitHub

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

[Logstash] Add ability to set condition for logs and metrics. #5557

Merged
merged 2 commits into from
Mar 21, 2023
Merged

[Logstash] Add ability to set condition for logs and metrics. #5557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fa9ce3
Add ability to set condition for logs and metrics.
BenB196 Mar 16, 2023
dce9ba9
Merge branch 'main' into logstash-conditions
BenB196 Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/logstash/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "2.3.0-preview1"
changes:
- description: Add ability to set condition for logs and metrics.
type: enhancement
link: https://github.com/elastic/integrations/pull/5557
- version: "2.2.3-preview1"
changes:
- description: Clarify that the metrics collected power the Stack Monitoring application
Expand Down
5 changes: 4 additions & 1 deletion packages/logstash/data_stream/log/agent/stream/log.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ processors:
- add_fields:
target: ''
fields:
ecs.version: 1.10.0
ecs.version: 1.10.0
{{#if condition}}
condition: {{ condition }}
{{/if}}
5 changes: 4 additions & 1 deletion packages/logstash/data_stream/node/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ password: {{password}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
{{/if}}
{{/if}}
{{#if condition}}
condition: {{ condition }}
{{/if}}
5 changes: 4 additions & 1 deletion packages/logstash/data_stream/node_stats/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ password: {{password}}
period: {{period}}
{{#if ssl}}
ssl: {{ssl}}
{{/if}}
{{/if}}
{{#if condition}}
condition: {{ condition }}
{{/if}}
5 changes: 4 additions & 1 deletion packages/logstash/data_stream/slowlog/agent/stream/log.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ processors:
- add_fields:
target: ''
fields:
ecs.version: 1.10.0
ecs.version: 1.10.0
{{#if condition}}
condition: {{ condition }}
{{/if}}
17 changes: 16 additions & 1 deletion packages/logstash/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: logstash
title: Logstash
version: 2.2.3-preview1
version: 2.3.0-preview1
description: Collect logs and metrics from Logstash with Elastic Agent.
type: integration
icons:
Expand Down Expand Up @@ -32,6 +32,14 @@ policy_templates:
- type: logfile
title: "Logs"
description: "Collect application and slowlog logs from Logstash instances"
vars:
- name: condition
title: Condition
description: Condition to filter when to collect this input
type: text
multi: false
required: false
show_user: false
- type: logstash/metrics
title: "Metrics (Stack Monitoring)"
description: "Collect node metrics and stats from Logstash instances to power the Stack Monitoring application in Kibana"
Expand Down Expand Up @@ -69,3 +77,10 @@ policy_templates:
#certificate_authorities: ["/etc/ca.crt"]
#certificate: "/etc/client.crt"
#key: "/etc/client.key"
- name: condition
title: Condition
description: Condition to filter when to collect this input
type: text
multi: false
required: false
show_user: false