Skip to content

[teleport] Update event-groups ingest pipeline to manage cloud fields if already present #12851

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Mar 4, 2025
Merged

[teleport] Update event-groups ingest pipeline to manage cloud fields if already present #12851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
68c69fd
Update event-groups ingest pipeline - teleport
mrodm Feb 5, 2025
356b31c
Teleport - Ensure system tests wait to be ingestd all test docs/logs
mrodm Feb 19, 2025
69b1050
Upate version and add changelog entry
mrodm Feb 20, 2025
be48391
Test with elastic-package - main bbd8bcadb505
mrodm Feb 20, 2025
7989320
Update pipeline
mrodm Feb 20, 2025
8b14c29
Test failure
mrodm Feb 20, 2025
ebe8db9
Update comments for override parameters added
mrodm Feb 20, 2025
3e84dbd
Replace overrides by if conditions
mrodm Feb 27, 2025
53425f1
Add remove processors
mrodm Feb 27, 2025
8911f47
Remove debug changes to test mapping-based validation
mrodm Feb 27, 2025
7eea2ed
Restore same deps as in upstream/main
mrodm Feb 27, 2025
1784669
Update changelog description
mrodm Feb 28, 2025
File filter

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/teleport/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.2.2"
changes:
- description: Update event-groups pipeline to take into account of whether cloud fields were already set.
type: bugfix
link: https://github.com/elastic/integrations/pull/12851
- version: "1.2.1"
changes:
- description: Update links to getting started docs
Expand Down
2 changes: 2 additions & 0 deletions packages/teleport/data_stream/audit/_dev/test/system/test-filestream-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ numeric_keyword_fields:
- log.file.idxhi
- log.file.idxlo
- log.file.vol
assert:
hit_count: 270
32 changes: 32 additions & 0 deletions packages/teleport/data_stream/audit/elasticsearch/ingest_pipeline/event-groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,14 +872,26 @@ processors:
field: teleport.audit.aws_region
target_field: cloud.region
ignore_missing: true
if: ctx.cloud?.region == null
- remove:
field: teleport.audit.aws_region
ignore_missing: true
- rename:
field: teleport.audit.aws_service
target_field: cloud.service.name
ignore_missing: true
if: ctx.cloud?.service?.name == null
- remove:
field: teleport.audit.aws_service
ignore_missing: true
- rename:
field: teleport.audit.aws_host
target_field: cloud.instance.id
ignore_missing: true
if: ctx.cloud?.instance?.id == null
- remove:
field: teleport.audit.aws_host
ignore_missing: true
- rename:
field: teleport.audit.aws_assumed_role
target_field: teleport.audit.app.aws.assumed_role
Expand Down Expand Up @@ -948,6 +960,10 @@ processors:
field: teleport.audit.db_aws_region
target_field: cloud.region
ignore_missing: true
if: ctx.cloud?.region == null
- remove:
field: teleport.audit.db_aws_region
ignore_missing: true
- set:
field: cloud.provider
value: aws
Expand All @@ -968,6 +984,10 @@ processors:
field: teleport.audit.db_gcp_instance_id
target_field: cloud.instance.id
ignore_missing: true
if: ctx.cloud?.instance?.id == null
- remove:
field: teleport.audit.db_gcp_instance_id
ignore_missing: true
- rename:
field: teleport.audit.db_roles
target_field: teleport.audit.database.roles
Expand Down Expand Up @@ -1407,6 +1427,10 @@ processors:
field: teleport.audit.instance_id
target_field: cloud.instance.id
ignore_missing: true
if: ctx.cloud?.instance?.id == null
- remove:
field: teleport.audit.instance_id
ignore_missing: true
- rename:
field: teleport.audit.exit_code
target_field: process.exit_code
Expand All @@ -1426,11 +1450,19 @@ processors:
field: teleport.audit.account_id
target_field: cloud.account.id
ignore_missing: true
if: ctx.cloud?.account?.id == null
- remove:
field: teleport.audit.account_id
ignore_missing: true
- rename:
field: teleport.audit.region
target_field: cloud.region
ignore_missing: true
ignore_failure: true
if: ctx.cloud?.region == null
- remove:
field: teleport.audit.region
ignore_missing: true
Comment on lines +1462 to +1465
Copy link
Collaborator Author

@mrodm mrodm Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When using if conditions, as the source fields is not renamed, it must be added a new remove processor for each one.
Copy link
Contributor

@efd6 efd6 Mar 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be in a single remove processor block, but I think this is less prone to future damage.
- rename:
field: teleport.audit.stdout
target_field: teleport.audit.database.aws.ssm_run.stdout
Expand Down
2 changes: 1 addition & 1 deletion packages/teleport/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 3.0.3
name: teleport
title: "Teleport"
version: 1.2.1
version: 1.2.2
source:
license: "Elastic-2.0"
description: "Collect logs from Teleport with Elastic Agent."
Expand Down