Skip to content

[AWS] Fix cloudtrail pipeline to accept us-gov arn #16905

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
kaiyan-sheng merged 2 commits into from
Jan 9, 2026
Merged

[AWS] Fix cloudtrail pipeline to accept us-gov arn #16905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cedae23
Fix aws cloudtrail pipeline to accept us-gov arn
Jan 8, 2026
a6bc242
add changelog
Jan 8, 2026
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/aws/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: "5.5.1"
changes:
- description: Added support for extracting user name from AWS GovCloud STS ARNs and fixed management_event field type conversion.
type: bugfix
link: https://github.com/elastic/integrations/pull/16905
- version: "5.5.0"
changes:
- description: Add dashboards for AWS Web Application Firewall data stream.
Expand Down
1 change: 1 addition & 0 deletions packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-us-gov-arn.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"eventVersion":"1.11","userIdentity":{"type":"AssumedRole","principalId":"AROAEXAMPLE:i-example1234567890","arn":"arn:aws-us-gov:sts::111111111111:assumed-role/ExampleRole/i-example1234567890","accountId":"111111111111","accessKeyId":"ASIAEXAMPLE","sessionContext":{"sessionIssuer":{"type":"Role","principalId":"AROAEXAMPLE","arn":"arn:aws-us-gov:iam::111111111111:role/ExampleRole","accountId":"111111111111","userName":"ExampleRole"},"attributes":{"creationDate":"2026-01-05T17:53:33Z","mfaAuthenticated":"false"},"ec2RoleDelivery":"2.0"}},"eventTime":"2026-01-05T18:46:26Z","eventSource":"ssm.amazonaws.com","eventName":"UpdateInstanceInformation","awsRegion":"us-gov-east-1","sourceIPAddress":"81.2.69.144","userAgent":"aws-sdk-go/1.55.5 (go1.23.8; windows; amd64) exec-env/EC2 amazon-ssm-agent/3.3.2471.0","requestParameters":{"instanceId":"i-example1234567890","agentVersion":"3.3.2471.0","agentStatus":"Active","platformType":"Windows","platformName":"Microsoft Windows Server 2022 Datacenter","platformVersion":"10.0.20348","iPAddress":"HIDDEN_DUE_TO_SECURITY_REASONS","computerName":"example-host.example.com","agentName":"amazon-ssm-agent","availabilityZone":"us-gov-east-1b","availabilityZoneId":"usge1-az2","sSMConnectionChannel":"ssmmessages"},"responseElements":null,"requestID":"be50efb8-2ecb-4a40-a9ac-533ffa351EXAMPLE","eventID":"46a04795-4e02-4710-a395-5a0f578cfEXAMPLE","readOnly":false,"eventType":"AwsApiCall","managementEvent":true,"recipientAccountId":"111111111111","eventCategory":"Management","tlsDetails":{"tlsVersion":"TLSv1.2","cipherSuite":"ECDHE-RSA-AES128-GCM-SHA256","clientProvidedHostHeader":"ssm.us-gov-east-1.amazonaws.com"}}
139 changes: 139 additions & 0 deletions packages/aws/data_stream/cloudtrail/_dev/test/pipeline/test-us-gov-arn.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"expected": [
{
"@timestamp": "2026-01-05T18:46:26.000Z",
"actor": {
"entity": {
"id": [
"arn:aws-us-gov:sts::111111111111:assumed-role/ExampleRole/i-example1234567890"
]
}
},
"aws": {
"cloudtrail": {
"event_category": "Management",
"event_type": "AwsApiCall",
"event_version": "1.11",
"flattened": {
"request_parameters": {
"agentName": "amazon-ssm-agent",
"agentStatus": "Active",
"agentVersion": "3.3.2471.0",
"availabilityZone": "us-gov-east-1b",
"availabilityZoneId": "usge1-az2",
"computerName": "example-host.example.com",
"iPAddress": "HIDDEN_DUE_TO_SECURITY_REASONS",
"instanceId": "i-example1234567890",
"platformName": "Microsoft Windows Server 2022 Datacenter",
"platformType": "Windows",
"platformVersion": "10.0.20348",
"sSMConnectionChannel": "ssmmessages"
}
},
"management_event": "true",
"read_only": false,
"recipient_account_id": "111111111111",
"request_id": "be50efb8-2ecb-4a40-a9ac-533ffa351EXAMPLE",
"request_parameters": "{iPAddress=HIDDEN_DUE_TO_SECURITY_REASONS, instanceId=i-example1234567890, computerName=example-host.example.com, availabilityZoneId=usge1-az2, platformVersion=10.0.20348, platformType=Windows, agentVersion=3.3.2471.0, agentName=amazon-ssm-agent, sSMConnectionChannel=ssmmessages, platformName=Microsoft Windows Server 2022 Datacenter, agentStatus=Active, availabilityZone=us-gov-east-1b}",
"user_identity": {
"access_key_id": "ASIAEXAMPLE",
"arn": "arn:aws-us-gov:sts::111111111111:assumed-role/ExampleRole/i-example1234567890",
"session_context": {
"creation_date": "2026-01-05T17:53:33.000Z",
"mfa_authenticated": "false",
"session_issuer": {
"account_id": "111111111111",
"arn": "arn:aws-us-gov:iam::111111111111:role/ExampleRole",
"principal_id": "AROAEXAMPLE",
"type": "Role"
}
},
"type": "AssumedRole"
}
}
},
"cloud": {
"account": {
"id": "111111111111"
},
"region": "us-gov-east-1"
},
"ecs": {
"version": "8.11.0"
},
"event": {
"action": "UpdateInstanceInformation",
"created": "2021-11-11T01:02:03.123456789Z",
"id": "46a04795-4e02-4710-a395-5a0f578cfEXAMPLE",
"kind": "event",
"original": "{\"eventVersion\":\"1.11\",\"userIdentity\":{\"type\":\"AssumedRole\",\"principalId\":\"AROAEXAMPLE:i-example1234567890\",\"arn\":\"arn:aws-us-gov:sts::111111111111:assumed-role/ExampleRole/i-example1234567890\",\"accountId\":\"111111111111\",\"accessKeyId\":\"ASIAEXAMPLE\",\"sessionContext\":{\"sessionIssuer\":{\"type\":\"Role\",\"principalId\":\"AROAEXAMPLE\",\"arn\":\"arn:aws-us-gov:iam::111111111111:role/ExampleRole\",\"accountId\":\"111111111111\",\"userName\":\"ExampleRole\"},\"attributes\":{\"creationDate\":\"2026-01-05T17:53:33Z\",\"mfaAuthenticated\":\"false\"},\"ec2RoleDelivery\":\"2.0\"}},\"eventTime\":\"2026-01-05T18:46:26Z\",\"eventSource\":\"ssm.amazonaws.com\",\"eventName\":\"UpdateInstanceInformation\",\"awsRegion\":\"us-gov-east-1\",\"sourceIPAddress\":\"81.2.69.144\",\"userAgent\":\"aws-sdk-go/1.55.5 (go1.23.8; windows; amd64) exec-env/EC2 amazon-ssm-agent/3.3.2471.0\",\"requestParameters\":{\"instanceId\":\"i-example1234567890\",\"agentVersion\":\"3.3.2471.0\",\"agentStatus\":\"Active\",\"platformType\":\"Windows\",\"platformName\":\"Microsoft Windows Server 2022 Datacenter\",\"platformVersion\":\"10.0.20348\",\"iPAddress\":\"HIDDEN_DUE_TO_SECURITY_REASONS\",\"computerName\":\"example-host.example.com\",\"agentName\":\"amazon-ssm-agent\",\"availabilityZone\":\"us-gov-east-1b\",\"availabilityZoneId\":\"usge1-az2\",\"sSMConnectionChannel\":\"ssmmessages\"},\"responseElements\":null,\"requestID\":\"be50efb8-2ecb-4a40-a9ac-533ffa351EXAMPLE\",\"eventID\":\"46a04795-4e02-4710-a395-5a0f578cfEXAMPLE\",\"readOnly\":false,\"eventType\":\"AwsApiCall\",\"managementEvent\":true,\"recipientAccountId\":\"111111111111\",\"eventCategory\":\"Management\",\"tlsDetails\":{\"tlsVersion\":\"TLSv1.2\",\"cipherSuite\":\"ECDHE-RSA-AES128-GCM-SHA256\",\"clientProvidedHostHeader\":\"ssm.us-gov-east-1.amazonaws.com\"}}",
"outcome": "success",
"provider": "ssm.amazonaws.com",
"type": [
"info"
]
},
"related": {
"entity": [
"ASIAEXAMPLE",
"ExampleRole",
"arn:aws-us-gov:sts::111111111111:assumed-role/ExampleRole/i-example1234567890",
"arn:aws-us-gov:iam::111111111111:role/ExampleRole"
],
"user": [
"AROAEXAMPLE:i-example1234567890",
"ExampleRole",
"i-example1234567890"
]
},
"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"
],
"tls": {
"cipher": "ECDHE-RSA-AES128-GCM-SHA256",
"client": {
"server_name": "ssm.us-gov-east-1.amazonaws.com"
},
"version": "1.2",
"version_protocol": "tls"
},
"user": {
"changes": {
"name": "i-example1234567890"
},
"entity": {
"id": [
"arn:aws-us-gov:sts::111111111111:assumed-role/ExampleRole/i-example1234567890"
]
},
"id": "AROAEXAMPLE:i-example1234567890",
"name": "ExampleRole"
},
"user_agent": {
"device": {
"name": "Other"
},
"name": "aws-sdk-go",
"original": "aws-sdk-go/1.55.5 (go1.23.8; windows; amd64) exec-env/EC2 amazon-ssm-agent/3.3.2471.0",
"version": "1.55.5"
}
}
]
}
11 changes: 7 additions & 4 deletions packages/aws/data_stream/cloudtrail/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ processors:
- grok:
field: aws.cloudtrail.user_identity.arn
patterns:
- "arn:aws:sts:.*/%{GREEDYDATA:user.changes.name}$"
- "arn:(aws|aws-us-gov):sts:.*/%{GREEDYDATA:user.changes.name}$"
ignore_missing: true
if: (ctx.aws?.cloudtrail?.user_identity?.type == 'AssumedRole' || ctx.aws?.cloudtrail?.user_identity?.type == 'FederatedUser') && ctx.aws?.cloudtrail?.user_identity?.arn != null
tag: extract_user_name_from_arn
Expand Down Expand Up @@ -1239,9 +1239,12 @@ processors:
field: json.apiVersion
target_field: aws.cloudtrail.api_version
ignore_failure: true
- rename:
field: json.managementEvent
target_field: aws.cloudtrail.management_event
- script:
lang: painless
source: |
if (ctx.json?.managementEvent != null) {
ctx.aws.cloudtrail.management_event = String.valueOf(ctx.json.managementEvent);
}
ignore_failure: true
- rename:
field: json.readOnly
Expand Down
2 changes: 1 addition & 1 deletion packages/aws/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 3.4.0
name: aws
title: AWS
version: 5.5.0
version: 5.5.1
description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent.
type: integration
categories:
Expand Down