Skip to content

Commit feb1b90

Browse files
feat(citrix_adc): Preserve event.original when errors occur in pipelines in log data stream (#15902)
- Added append processor to global on_failure to preserve event original - Added append processor to default pipelines to preserve event original if error.message is set
1 parent 7f2ab1f commit feb1b90

17 files changed

+76
-5
lines changed

packages/citrix_adc/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.18.0"
3+
changes:
4+
- description: Preserve event.original on pipeline error in log data stream.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/15902
27
- version: "1.17.5"
38
changes:
49
- description: Properly parse failed status conditions in sslvpn pipeline

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/alg_feature.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,7 @@ on_failure:
197197
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
198198
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
199199
failed with message '{{{ _ingest.on_failure_message }}}'
200+
- append:
201+
field: tags
202+
value: preserve_original_event
203+
allow_duplicates: false

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/appfw_feature.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,7 @@ on_failure:
194194
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
195195
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
196196
failed with message '{{{ _ingest.on_failure_message }}}'
197+
- append:
198+
field: tags
199+
value: preserve_original_event
200+
allow_duplicates: false

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/bot_feature.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@ on_failure:
4040
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
4141
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
4242
failed with message '{{{ _ingest.on_failure_message }}}'
43+
- append:
44+
field: tags
45+
value: preserve_original_event
46+
allow_duplicates: false

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/cef.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,7 @@ on_failure:
135135
- set:
136136
field: event.kind
137137
value: pipeline_error
138+
- append:
139+
field: tags
140+
value: preserve_original_event
141+
allow_duplicates: false

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/ci_feature.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,7 @@ on_failure:
241241
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
242242
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
243243
failed with message '{{{ _ingest.on_failure_message }}}'
244+
- append:
245+
field: tags
246+
value: preserve_original_event
247+
allow_duplicates: false

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/cvpn_feature.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ on_failure:
3737
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
3838
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
3939
failed with message '{{{ _ingest.on_failure_message }}}'
40+
- append:
41+
field: tags
42+
value: preserve_original_event
43+
allow_duplicates: false

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ processors:
5555
type: long
5656
ignore_missing: true
5757

58-
# Time zone (in order: log, config, locale, default to UTC).
5958

59+
# Time zone (in order: log, config, locale, default to UTC).
6060
- set:
6161
field: _tmp.tz
6262
value: UTC
@@ -79,8 +79,8 @@ processors:
7979
field: event.timezone
8080
copy_from: _tmp.tz
8181

82-
# Syslog timestamp
8382

83+
# Syslog timestamp
8484
- date:
8585
if: ctx._tmp?.timestamp8601 != null
8686
tag: date_syslog_timestamp8601
@@ -174,8 +174,8 @@ processors:
174174
}
175175
});
176176
177-
# Native-format timestamp
178177
178+
# Native-format timestamp
179179
- date:
180180
tag: date_timestamp_native
181181
field: _tmp.timestamp_native
@@ -257,8 +257,8 @@ processors:
257257
field: error.message
258258
value: 'Processor {{{_ingest.on_failure_processor_type}}} with tag {{{_ingest.on_failure_processor_tag}}} in pipeline {{{_ingest.on_failure_pipeline}}} failed with message: {{{_ingest.on_failure_message}}}'
259259

260-
# Move vendor time fields to ECS.
261260

261+
# Move vendor time fields to ECS.
262262
- set:
263263
tag: set_@timestamp_from_citrix_native
264264
field: '@timestamp'
@@ -450,6 +450,12 @@ processors:
450450
- _conf
451451
tag: remove_tmp_and_conf
452452
ignore_missing: true
453+
- append:
454+
tag: append_preserve_original_event_on_error
455+
field: tags
456+
value: preserve_original_event
457+
allow_duplicates: false
458+
if: ctx.error?.message != null
453459
on_failure:
454460
- remove:
455461
field:
@@ -465,3 +471,7 @@ on_failure:
465471
field: event.kind
466472
tag: set_pipeline_error_to_event_kind
467473
value: pipeline_error
474+
- append:
475+
field: tags
476+
value: preserve_original_event
477+
allow_duplicates: false

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/dns_and_ssli_feature.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,7 @@ on_failure:
112112
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
113113
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
114114
failed with message '{{{ _ingest.on_failure_message }}}'
115+
- append:
116+
field: tags
117+
value: preserve_original_event
118+
allow_duplicates: false

packages/citrix_adc/data_stream/log/elasticsearch/ingest_pipeline/ica_feature.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,3 +584,7 @@ on_failure:
584584
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
585585
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
586586
failed with message '{{{ _ingest.on_failure_message }}}'
587+
- append:
588+
field: tags
589+
value: preserve_original_event
590+
allow_duplicates: false

0 commit comments

Comments
 (0)