-
Notifications
You must be signed in to change notification settings - Fork 641
[aws.cloudtrail] Backport ingest pipeline improvements and bugfixes to backport-aws-6.x #20972
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.
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
Open
brijesh-elastic
wants to merge
2
commits into
elastic:backport-aws-6.x
Choose a base branch
from
brijesh-elastic:backport-aws-6.x-cloudtrail-ingest-pipeline
base: backport-aws-6.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,519
−506
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...ges/aws/data_stream/cloudtrail/_dev/test/pipeline/test-assume-role-email-session-json.log
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"eventVersion":"1.05","userIdentity":{"type":"AssumedRole","principalId":"AROAIN5ATK5U7KEXAMPLE:firstname.lastname@example.com","arn":"arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com","accountId":"111111111111","accessKeyId":"AKIAI44QH8DHBEXAMPLE","sessionContext":{"attributes":{"mfaAuthenticated":"false","creationDate":"2019-10-02T21:50:54Z"},"sessionIssuer":{"type":"Role","principalId":"AROAIN5ATK5U7KEXAMPLE","arn":"arn:aws:iam::111111111111:role/AWSReservedSSO_SecurityAudit_8df5ccd37b","accountId":"111111111111","userName":"AWSReservedSSO_SecurityAudit_8df5ccd37b"}}},"eventTime":"2019-10-02T22:12:29Z","eventSource":"sts.amazonaws.com","eventName":"AssumeRole","awsRegion":"us-east-2","sourceIPAddress":"81.2.69.144","userAgent":"aws-cli/1.16.248 Python/3.4.7 Linux/4.9.184-0.1.ac.235.83.329.metal1.x86_64 botocore/1.12.239","requestParameters":{"roleArn":"arn:aws:iam::111111111111:role/JohnRole2","roleSessionName":"firstname.lastname@example.com","durationSeconds":3600},"responseElements":{"credentials":{"accessKeyId":"ASIAWHOJDLGPOEXAMPLE","expiration":"Oct 2, 2019 11:12:29 PM","sessionToken":"EXAMPLETOKEN"},"assumedRoleUser":{"assumedRoleId":"AROAIFR7WHDTSOYQYHFUE:firstname.lastname@example.com","arn":"arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com"}},"requestID":"b96b0e4e-e561-11e9-8b3f-7b396EXAMPLE","eventID":"2a17948f-3042-46ec-98e2-62865EXAMPLE","eventType":"AwsApiCall","recipientAccountId":"111111111111"} |
161 changes: 161 additions & 0 deletions
161
...tream/cloudtrail/_dev/test/pipeline/test-assume-role-email-session-json.log-expected.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| { | ||
| "expected": [ | ||
| { | ||
| "@timestamp": "2019-10-02T22:12:29.000Z", | ||
| "actor": { | ||
| "entity": { | ||
| "id": [ | ||
| "arn:aws:iam::111111111111:role/AWSReservedSSO_SecurityAudit_8df5ccd37b" | ||
| ] | ||
| } | ||
| }, | ||
| "aws": { | ||
| "cloudtrail": { | ||
| "event_type": "AwsApiCall", | ||
| "event_version": "1.05", | ||
| "flattened": { | ||
| "request_parameters": { | ||
| "durationSeconds": 3600, | ||
| "roleArn": "arn:aws:iam::111111111111:role/JohnRole2", | ||
| "roleSessionName": "firstname.lastname@example.com" | ||
| }, | ||
| "response_elements": { | ||
| "assumedRoleUser": { | ||
| "arn": "arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com", | ||
| "assumedRoleId": "AROAIFR7WHDTSOYQYHFUE:firstname.lastname@example.com" | ||
| }, | ||
| "credentials": { | ||
| "accessKeyId": "ASIAWHOJDLGPOEXAMPLE", | ||
| "expiration": "Oct 2, 2019 11:12:29 PM", | ||
| "sessionToken": "EXAMPLETOKEN" | ||
| } | ||
| } | ||
| }, | ||
| "recipient_account_id": "111111111111", | ||
| "request_id": "b96b0e4e-e561-11e9-8b3f-7b396EXAMPLE", | ||
| "request_parameters": "{durationSeconds=3600, roleArn=arn:aws:iam::111111111111:role/JohnRole2, roleSessionName=firstname.lastname@example.com}", | ||
| "response_elements": "{assumedRoleUser={assumedRoleId=AROAIFR7WHDTSOYQYHFUE:firstname.lastname@example.com, arn=arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com}, credentials={accessKeyId=ASIAWHOJDLGPOEXAMPLE, sessionToken=EXAMPLETOKEN, expiration=Oct 2, 2019 11:12:29 PM}}", | ||
| "user_identity": { | ||
| "access_key_id": "AKIAI44QH8DHBEXAMPLE", | ||
| "arn": "arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com", | ||
| "session_context": { | ||
| "creation_date": "2019-10-02T21:50:54.000Z", | ||
| "mfa_authenticated": "false", | ||
| "session_issuer": { | ||
| "account_id": "111111111111", | ||
| "arn": "arn:aws:iam::111111111111:role/AWSReservedSSO_SecurityAudit_8df5ccd37b", | ||
| "principal_id": "AROAIN5ATK5U7KEXAMPLE", | ||
| "type": "Role" | ||
| } | ||
| }, | ||
| "type": "AssumedRole" | ||
| } | ||
| } | ||
| }, | ||
| "cloud": { | ||
| "account": { | ||
| "id": "111111111111" | ||
| }, | ||
| "provider": "aws", | ||
| "region": "us-east-2", | ||
| "service": { | ||
| "name": "sts" | ||
| } | ||
| }, | ||
| "ecs": { | ||
| "version": "8.11.0" | ||
| }, | ||
| "event": { | ||
| "action": "AssumeRole", | ||
| "category": [ | ||
| "authentication" | ||
| ], | ||
| "created": "2021-11-11T01:02:03.123456789Z", | ||
| "id": "2a17948f-3042-46ec-98e2-62865EXAMPLE", | ||
| "kind": "event", | ||
| "original": "{\"eventVersion\":\"1.05\",\"userIdentity\":{\"type\":\"AssumedRole\",\"principalId\":\"AROAIN5ATK5U7KEXAMPLE:firstname.lastname@example.com\",\"arn\":\"arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com\",\"accountId\":\"111111111111\",\"accessKeyId\":\"AKIAI44QH8DHBEXAMPLE\",\"sessionContext\":{\"attributes\":{\"mfaAuthenticated\":\"false\",\"creationDate\":\"2019-10-02T21:50:54Z\"},\"sessionIssuer\":{\"type\":\"Role\",\"principalId\":\"AROAIN5ATK5U7KEXAMPLE\",\"arn\":\"arn:aws:iam::111111111111:role/AWSReservedSSO_SecurityAudit_8df5ccd37b\",\"accountId\":\"111111111111\",\"userName\":\"AWSReservedSSO_SecurityAudit_8df5ccd37b\"}}},\"eventTime\":\"2019-10-02T22:12:29Z\",\"eventSource\":\"sts.amazonaws.com\",\"eventName\":\"AssumeRole\",\"awsRegion\":\"us-east-2\",\"sourceIPAddress\":\"81.2.69.144\",\"userAgent\":\"aws-cli/1.16.248 Python/3.4.7 Linux/4.9.184-0.1.ac.235.83.329.metal1.x86_64 botocore/1.12.239\",\"requestParameters\":{\"roleArn\":\"arn:aws:iam::111111111111:role/JohnRole2\",\"roleSessionName\":\"firstname.lastname@example.com\",\"durationSeconds\":3600},\"responseElements\":{\"credentials\":{\"accessKeyId\":\"ASIAWHOJDLGPOEXAMPLE\",\"expiration\":\"Oct 2, 2019 11:12:29 PM\",\"sessionToken\":\"EXAMPLETOKEN\"},\"assumedRoleUser\":{\"assumedRoleId\":\"AROAIFR7WHDTSOYQYHFUE:firstname.lastname@example.com\",\"arn\":\"arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com\"}},\"requestID\":\"b96b0e4e-e561-11e9-8b3f-7b396EXAMPLE\",\"eventID\":\"2a17948f-3042-46ec-98e2-62865EXAMPLE\",\"eventType\":\"AwsApiCall\",\"recipientAccountId\":\"111111111111\"}", | ||
| "outcome": "success", | ||
| "provider": "sts.amazonaws.com", | ||
| "type": [ | ||
| "info" | ||
| ] | ||
| }, | ||
| "related": { | ||
| "entity": [ | ||
| "firstname.lastname@example.com", | ||
| "arn:aws:iam::111111111111:role/AWSReservedSSO_SecurityAudit_8df5ccd37b", | ||
| "AKIAI44QH8DHBEXAMPLE", | ||
| "arn:aws:sts::111111111111:assumed-role/AWSReservedSSO_SecurityAudit_8df5ccd37b/firstname.lastname@example.com", | ||
| "AWSReservedSSO_SecurityAudit_8df5ccd37b", | ||
| "arn:aws:iam::111111111111:role/JohnRole2" | ||
| ], | ||
| "ip": [ | ||
| "81.2.69.144" | ||
| ], | ||
| "user": [ | ||
| "firstname.lastname@example.com", | ||
| "firstname.lastname", | ||
| "AROAIN5ATK5U7KEXAMPLE:firstname.lastname@example.com", | ||
| "AWSReservedSSO_SecurityAudit_8df5ccd37b" | ||
| ] | ||
| }, | ||
| "source": { | ||
| "address": "81.2.69.144", | ||
| "geo": { | ||
| "city_name": "London", | ||
| "continent_name": "Europe", | ||
| "country_iso_code": "GB", | ||
| "country_name": "United Kingdom", | ||
| "location": { | ||
| "lat": 51.5142, | ||
| "lon": -0.0931 | ||
| }, | ||
| "region_iso_code": "GB-ENG", | ||
| "region_name": "England" | ||
| }, | ||
| "ip": "81.2.69.144" | ||
| }, | ||
| "tags": [ | ||
| "preserve_original_event", | ||
| "actor_target_mapping" | ||
| ], | ||
| "target": { | ||
| "entity": { | ||
| "id": [ | ||
| "arn:aws:iam::111111111111:role/JohnRole2" | ||
| ] | ||
| } | ||
| }, | ||
| "user": { | ||
| "email": "firstname.lastname@example.com", | ||
| "entity": { | ||
| "id": [ | ||
| "arn:aws:iam::111111111111:role/AWSReservedSSO_SecurityAudit_8df5ccd37b" | ||
| ] | ||
| }, | ||
| "id": "AROAIN5ATK5U7KEXAMPLE:firstname.lastname@example.com", | ||
| "name": "AWSReservedSSO_SecurityAudit_8df5ccd37b", | ||
| "target": { | ||
| "entity": { | ||
| "id": [ | ||
| "arn:aws:iam::111111111111:role/JohnRole2" | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "user_agent": { | ||
| "device": { | ||
| "name": "Spider" | ||
| }, | ||
| "name": "aws-cli", | ||
| "original": "aws-cli/1.16.248 Python/3.4.7 Linux/4.9.184-0.1.ac.235.83.329.metal1.x86_64 botocore/1.12.239", | ||
| "os": { | ||
| "full": "Linux 4.9.184", | ||
| "name": "Linux", | ||
| "version": "4.9.184" | ||
| }, | ||
| "version": "1.16.248" | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Severity: 🟡 Medium
confidence: highpath: packages/aws/changelog.yml:10Changelog links a different PR number
Details
The changelog entries added on lines 10, 15, 25 point at
pull/20403(line 10),pull/20318(line 15),pull/20403(line 25), but they were added in PR #20972. They are likely leftover template placeholders or copies from another PR.Recommendation:
Point each added changelog entry's link at this PR:
🤖 AI-Generated Review | Vera Review Bot - v0.3.0 | 📚 Knowledge base: integration-skills