Skip to content

Commit eea70e5

Browse files
feat: Preserve event.original when errors occur in pipelines
- Added append processor to global on_failure to preserve event original - Added append processor to default piplines to preserve event original if error.message is set Affects the following integrations: - imperva - iptables - juniper_srx - modsecurity - netflow - panw - pfsense - proxysg - qnap_nas - snort - sonicwall_firewall
1 parent 8477eb1 commit eea70e5

File tree

72 files changed

+332
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+332
-11
lines changed

packages/imperva/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.9.0"
3+
changes:
4+
- description: Preserve event.original on pipeline error.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/15798
27
- version: "1.8.2"
38
changes:
49
- description: Generate processor tags and normalize error handler.

packages/imperva/data_stream/securesphere/elasticsearch/ingest_pipeline/default.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,12 @@ processors:
336336
tag: set_pipeline_error_to_event_kind
337337
value: pipeline_error
338338
if: ctx.error?.message != null
339+
- append:
340+
tag: append_preserve_original_event_on_error
341+
field: tags
342+
value: preserve_original_event
343+
allow_duplicates: false
344+
if: ctx.error?.message != null
339345
on_failure:
340346
- append:
341347
field: error.message
@@ -347,3 +353,7 @@ on_failure:
347353
- set:
348354
field: event.kind
349355
value: pipeline_error
356+
- append:
357+
field: tags
358+
value: preserve_original_event
359+
allow_duplicates: false

packages/imperva/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 3.0.3
22
name: imperva
33
title: Imperva
4-
version: "1.8.2"
4+
version: "1.9.0"
55
description: Collect logs from Imperva devices with Elastic Agent.
66
categories: ["network", "security"]
77
type: integration

packages/iptables/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.22.0"
3+
changes:
4+
- description: Preserve event.original on pipeline error.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/15798
27
- version: "1.21.4"
38
changes:
49
- description: Generate processor tags and normalize error handler.

packages/iptables/data_stream/log/elasticsearch/ingest_pipeline/default.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,12 @@ processors:
415415
field:
416416
- _tmp
417417
ignore_failure: true
418+
- append:
419+
tag: append_preserve_original_event_on_error
420+
field: tags
421+
value: preserve_original_event
422+
allow_duplicates: false
423+
if: ctx.error?.message != null
418424
on_failure:
419425
- remove:
420426
field:
@@ -430,3 +436,7 @@ on_failure:
430436
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
431437
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
432438
failed with message '{{{ _ingest.on_failure_message }}}'
439+
- append:
440+
field: tags
441+
value: preserve_original_event
442+
allow_duplicates: false

packages/iptables/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: iptables
22
title: Iptables
3-
version: "1.21.4"
3+
version: "1.22.0"
44
description: Collect logs from Iptables with Elastic Agent.
55
type: integration
66
icons:

packages/juniper_srx/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.26.0"
3+
changes:
4+
- description: Preserve event.original on pipeline error.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/15798
27
- version: "1.25.2"
38
changes:
49
- description: Generate processor tags and normalize error handler.

packages/juniper_srx/data_stream/log/elasticsearch/ingest_pipeline/atp.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,3 +427,7 @@ on_failure:
427427
- set:
428428
field: event.kind
429429
value: pipeline_error
430+
- append:
431+
field: tags
432+
value: preserve_original_event
433+
allow_duplicates: false

packages/juniper_srx/data_stream/log/elasticsearch/ingest_pipeline/default.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,12 @@ processors:
434434
- juniper.srx.dstzone
435435
- syslog_pri
436436
ignore_missing: true
437+
- append:
438+
tag: append_preserve_original_event_on_error
439+
field: tags
440+
value: preserve_original_event
441+
allow_duplicates: false
442+
if: ctx.error?.message != null
437443
on_failure:
438444
- append:
439445
field: error.message
@@ -445,3 +451,7 @@ on_failure:
445451
- set:
446452
field: event.kind
447453
value: pipeline_error
454+
- append:
455+
field: tags
456+
value: preserve_original_event
457+
allow_duplicates: false

packages/juniper_srx/data_stream/log/elasticsearch/ingest_pipeline/flow.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,3 +427,7 @@ on_failure:
427427
- set:
428428
field: event.kind
429429
value: pipeline_error
430+
- append:
431+
field: tags
432+
value: preserve_original_event
433+
allow_duplicates: false

0 commit comments

Comments
 (0)