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

[salesforce] Ensure event.kind is correctly set for pipeline errors #7086

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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/salesforce/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "0.11.0"
changes:
- description: Ensure event.kind is correctly set for pipeline errors.
type: enhancement
link: https://github.com/elastic/integrations/pull/7086
- version: "0.10.0"
changes:
- description: Rename ownership from obs-service-integrations to obs-infraobs-integrations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@ processors:
ignore_failure: true
ignore_missing: true
on_failure:
- set:
field: error.message
value: '{{{_ingest.on_failure_message}}}'
- set:
field: event.kind
value: pipeline_error
- append:
field: error.message
value: '{{{ _ingest.on_failure_message }}}'
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ processors:
ignore_failure: true
ignore_missing: true
on_failure:
- set:
field: error.message
value: '{{{_ingest.on_failure_message}}}'
- set:
field: event.kind
value: pipeline_error
- append:
field: error.message
value: '{{{ _ingest.on_failure_message }}}'
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,9 @@ processors:
ignore_failure: true
ignore_missing: true
on_failure:
- set:
field: error.message
value: '{{_ingest.on_failure_message}}'
- append:
field: event.kind
value: pipeline_error
allow_duplicates: false
- set:
field: event.kind
value: pipeline_error
- append:
field: error.message
value: '{{{ _ingest.on_failure_message }}}'
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,9 @@ processors:
ignore_failure: true
ignore_missing: true
on_failure:
- set:
field: error.message
value: '{{{_ingest.on_failure_message}}}'
ignore_failure: true
ignore_empty_value: true
- set:
field: event.kind
value: pipeline_error
- append:
field: error.message
value: '{{{ _ingest.on_failure_message }}}'
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,9 @@ processors:
ignore_failure: true
ignore_missing: true
on_failure:
- set:
field: error.message
value: '{{_ingest.on_failure_message}}'
- append:
field: event.kind
value: pipeline_error
allow_duplicates: false
- set:
field: event.kind
value: pipeline_error
- append:
field: error.message
value: '{{{ _ingest.on_failure_message }}}'
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ processors:
ignore_failure: true
ignore_missing: true
on_failure:
- set:
field: error.message
value: '{{{_ingest.on_failure_message}}}'
- set:
field: event.kind
value: pipeline_error
- append:
field: error.message
value: '{{{ _ingest.on_failure_message }}}'
2 changes: 1 addition & 1 deletion packages/salesforce/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: salesforce
title: Salesforce
version: "0.10.0"
version: "0.11.0"
license: basic
description: Collect logs from Salesforce with Elastic Agent.
type: integration
Expand Down