Skip to content

Commit 46a32cc

Browse files
committed
azure: Add event.kind pipeline_error to on_failure handlers
Update ingest pipeline on_failure handlers to set event.kind to pipeline_error per best practices. This change updates the 23 pipelines that were missing this processor. The graphactivitylogs and signinlogs default.yml pipelines already had it and were not modified. The error.message format was also updated to follow the guidance from https://github.com/elastic/integrations/wiki/Fleet-Package-Code-Review-Comments#pipeline-on_failure-handler-must-set-errormessage
1 parent a6223f4 commit 46a32cc

24 files changed

Lines changed: 170 additions & 38 deletions

File tree

packages/azure/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- version: "1.35.2"
2+
changes:
3+
- description: Add missing event.kind pipeline_error handling to ingest pipeline on_failure handlers.
4+
type: bugfix
5+
link: https://github.com/elastic/integrations/pull/17176
16
- version: "1.35.1"
27
changes:
38
- description: Fix pipeline error when the `category` field is missing.

packages/azure/data_stream/activitylogs/elasticsearch/ingest_pipeline/azure-shared-pipeline.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,11 @@ processors:
8787
ignore_missing: true
8888
on_failure:
8989
- set:
90+
field: event.kind
91+
value: pipeline_error
92+
- append:
9093
field: error.message
91-
value: '{{ _ingest.on_failure_message }}'
94+
value: >-
95+
Processor '{{{ _ingest.on_failure_processor_type }}}'
96+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
97+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'

packages/azure/data_stream/activitylogs/elasticsearch/ingest_pipeline/default.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,12 @@ processors:
350350
name: '{{ IngestPipeline "azure-shared-pipeline" }}'
351351
on_failure:
352352
- set:
353+
field: event.kind
354+
value: pipeline_error
355+
- append:
353356
field: error.message
354-
value: |-
355-
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 }}"
357+
value: >-
358+
Processor '{{{ _ingest.on_failure_processor_type }}}'
359+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
360+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'
356361

packages/azure/data_stream/application_gateway/elasticsearch/ingest_pipeline/azure-shared-pipeline.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,11 @@ processors:
8484
ignore_empty_value: true
8585
on_failure:
8686
- set:
87+
field: event.kind
88+
value: pipeline_error
89+
- append:
8790
field: error.message
88-
value: '{{ _ingest.on_failure_message }}'
91+
value: >-
92+
Processor '{{{ _ingest.on_failure_processor_type }}}'
93+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
94+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'

packages/azure/data_stream/application_gateway/elasticsearch/ingest_pipeline/default.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,15 @@ processors:
327327
}
328328
dropEmptyFields(ctx);
329329
on_failure:
330+
- set:
331+
field: event.kind
332+
value: pipeline_error
330333
- append:
331-
field: "error.message"
332-
value: "{{ _ingest.on_failure_message }} {{ _ingest.on_failure_processor_type }}"
334+
field: error.message
335+
value: >-
336+
Processor '{{{ _ingest.on_failure_processor_type }}}'
337+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
338+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'
333339
- remove:
334340
field:
335341
- json

packages/azure/data_stream/auditlogs/elasticsearch/ingest_pipeline/azure-shared-pipeline.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,11 @@ processors:
8787
ignore_missing: true
8888
on_failure:
8989
- set:
90+
field: event.kind
91+
value: pipeline_error
92+
- append:
9093
field: error.message
91-
value: '{{ _ingest.on_failure_message }}'
94+
value: >-
95+
Processor '{{{ _ingest.on_failure_processor_type }}}'
96+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
97+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'

packages/azure/data_stream/auditlogs/elasticsearch/ingest_pipeline/default.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,5 +291,11 @@ processors:
291291
name: '{{ IngestPipeline "azure-shared-pipeline" }}'
292292
on_failure:
293293
- set:
294+
field: event.kind
295+
value: pipeline_error
296+
- append:
294297
field: error.message
295-
value: '{{ _ingest.on_failure_message }}'
298+
value: >-
299+
Processor '{{{ _ingest.on_failure_processor_type }}}'
300+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
301+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'

packages/azure/data_stream/eventhub/elasticsearch/ingest_pipeline/azure-shared-pipeline.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,11 @@ processors:
8787
ignore_missing: true
8888
on_failure:
8989
- set:
90+
field: event.kind
91+
value: pipeline_error
92+
- append:
9093
field: error.message
91-
value: '{{ _ingest.on_failure_message }}'
94+
value: >-
95+
Processor '{{{ _ingest.on_failure_processor_type }}}'
96+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
97+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'

packages/azure/data_stream/eventhub/elasticsearch/ingest_pipeline/default.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@ processors:
1616
name: '{{ IngestPipeline "parsed-message" }}'
1717
on_failure:
1818
- set:
19+
field: event.kind
20+
value: pipeline_error
21+
- append:
1922
field: error.message
20-
value: '{{ _ingest.on_failure_message }}'
23+
value: >-
24+
Processor '{{{ _ingest.on_failure_processor_type }}}'
25+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
26+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'

packages/azure/data_stream/eventhub/elasticsearch/ingest_pipeline/parsed-message.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,11 @@ processors:
7676
ignore_failure: true
7777
on_failure:
7878
- set:
79+
field: event.kind
80+
value: pipeline_error
81+
- append:
7982
field: error.message
80-
value: '{{ _ingest.on_failure_message }}'
83+
value: >-
84+
Processor '{{{ _ingest.on_failure_processor_type }}}'
85+
{{#_ingest.on_failure_processor_tag}}with tag '{{{ _ingest.on_failure_processor_tag }}}'
86+
{{/_ingest.on_failure_processor_tag}}failed with message '{{{ _ingest.on_failure_message }}}'

0 commit comments

Comments
 (0)