Skip to content
Merged
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/citrix_adc/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.18.0"
changes:
- description: Preserve event.original on pipeline error in log data stream.
type: enhancement
link: https://github.com/elastic/integrations/pull/15902
- version: "1.17.5"
changes:
- description: Properly parse failed status conditions in sslvpn pipeline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,7 @@ on_failure:
- set:
field: event.kind
value: pipeline_error
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -241,3 +241,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ processors:
type: long
ignore_missing: true

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

# Time zone (in order: log, config, locale, default to UTC).
- set:
field: _tmp.tz
value: UTC
Expand All @@ -79,8 +79,8 @@ processors:
field: event.timezone
copy_from: _tmp.tz

# Syslog timestamp

# Syslog timestamp
- date:
if: ctx._tmp?.timestamp8601 != null
tag: date_syslog_timestamp8601
Expand Down Expand Up @@ -174,8 +174,8 @@ processors:
}
});

# Native-format timestamp

# Native-format timestamp
- date:
tag: date_timestamp_native
field: _tmp.timestamp_native
Expand Down Expand Up @@ -257,8 +257,8 @@ processors:
field: error.message
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}}}'

# Move vendor time fields to ECS.

# Move vendor time fields to ECS.
- set:
tag: set_@timestamp_from_citrix_native
field: '@timestamp'
Expand Down Expand Up @@ -450,6 +450,12 @@ processors:
- _conf
tag: remove_tmp_and_conf
ignore_missing: true
- append:
tag: append_preserve_original_event_on_error
field: tags
value: preserve_original_event
allow_duplicates: false
if: ctx.error?.message != null
on_failure:
- remove:
field:
Expand All @@ -465,3 +471,7 @@ on_failure:
field: event.kind
tag: set_pipeline_error_to_event_kind
value: pipeline_error
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -584,3 +584,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -429,3 +429,7 @@ on_failure:
- set:
field: event.kind
value: pipeline_error
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -501,3 +501,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -306,3 +306,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,7 @@ on_failure:
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
{{/_ingest.on_failure_processor_tag}}in pipeline '{{{ _ingest.pipeline }}}'
failed with message '{{{ _ingest.on_failure_message }}}'
- append:
field: tags
value: preserve_original_event
allow_duplicates: false
2 changes: 1 addition & 1 deletion packages/citrix_adc/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: "3.0.2"
name: citrix_adc
title: Citrix ADC
version: "1.17.5"
version: "1.18.0"
description: This Elastic integration collects logs and metrics from Citrix ADC product.
type: integration
categories:
Expand Down