Skip to content

EntityAnalytics AD: add support for ECS entity fields #18337

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

Draft
chemamartinez wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

EntityAnalytics AD: add support for ECS entity fields #18337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a270b08
Add mfa_enabled field support
chemamartinez Apr 10, 2026
6f52662
Add managed field support
chemamartinez Apr 10, 2026
1cf05a6
Add last_activity field support
chemamartinez Apr 10, 2026
9b1f8bf
Add relationships fields support
chemamartinez Apr 10, 2026
5ec6d7d
Add test cases for new entity fields
chemamartinez Apr 10, 2026
d6f2435
Update changelog and bump version
chemamartinez Apr 10, 2026
8c016cd
Update changelog link
chemamartinez Apr 10, 2026
e2608f0
Remove last_logon_timestamp if date processor fails
chemamartinez Apr 17, 2026
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/entityanalytics_ad/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: "0.19.0"
changes:
- description: Add support for ECS entity fields.
type: enhancement
link: https://github.com/elastic/integrations/pull/18337
- version: "0.18.0"
changes:
- description: Add mail and userPrincipalName fields to support email and name-based entity matching.
Expand Down
46 changes: 46 additions & 0 deletions packages/entityanalytics_ad/data_stream/device/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,49 @@
type: keyword
- name: type
type: keyword
- name: host
type: group
fields:
- name: entity
type: group
fields:
- name: attributes
type: group
fields:
- name: managed
type: boolean
- name: lifecycle
type: group
fields:
- name: last_activity
type: date
- name: relationships
type: group
fields:
- name: owns
type: group
fields:
- name: id
type: keyword
- name: name
type: keyword
- name: domain
type: keyword
- name: administered_by
type: group
fields:
- name: id
type: keyword
- name: name
type: keyword
- name: domain
type: keyword
- name: supervises
type: group
fields:
- name: id
type: keyword
- name: name
type: keyword
- name: domain
type: keyword
6 changes: 6 additions & 0 deletions packages/entityanalytics_ad/data_stream/device/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@
description: True if a logon script is configured for the account.
- name: member_of
type: keyword
- name: direct_reports
type: keyword
- name: managed_by
type: keyword
- name: managed_objects
type: keyword
- name: msDS-*
type: keyword
- name: name
Expand Down
12 changes: 11 additions & 1 deletion packages/entityanalytics_ad/data_stream/entity/_dev/test/pipeline/test-device.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,18 @@
"RestrictedKrbHost/TEST12009.org.test.local",
"HOST/TEST12009.org.test.local"
],
"userAccountControl": "4096",
"when_changed": "2025-09-30T14:42:41Z",
"when_created": "2022-03-02T21:14:42Z"
"when_created": "2022-03-02T21:14:42Z",
"directReports": [
"CN=SubDevice01,OU=Computers,DC=org,DC=test,DC=local"
],
"managedBy": [
"CN=Jane Smith,OU=IT,DC=org,DC=test,DC=local"
],
"managedObjects": [
"CN=SomeResource,OU=Resources,DC=org,DC=test,DC=local"
]
},
"groups": [
{
Expand Down
57 changes: 57 additions & 0 deletions ...s/entityanalytics_ad/data_stream/entity/_dev/test/pipeline/test-device.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,23 @@
"bad_pwd_count": "0",
"cn": "TEST12009",
"description": "Kretts, Topsy",
"direct_reports": [
"CN=SubDevice01,OU=Computers,DC=org,DC=test,DC=local"
],
"distinguished_name": "CN=TEST12009,OU=Policy Exception 3,OU=Computers,OU=Information Technology Services,OU=Executive,OU=Users and Computers,DC=org,DC=test,DC=local",
"dns_host_name": "TEST12009.org.test.local",
"enabled": true,
"instance_type": "4",
"is_critical_system_object": false,
"last_logon": "2025-10-07T13:39:18.7867226Z",
"last_logon_timestamp": "2025-09-30T14:42:35.7840088Z",
"logon_count": "2275",
"managed_by": [
"CN=Jane Smith,OU=IT,DC=org,DC=test,DC=local"
],
"managed_objects": [
"CN=SomeResource,OU=Resources,DC=org,DC=test,DC=local"
],
"member_of": [
"CN=GPOD Office Updates,OU=User Groups,DC=org,DC=test,DC=local",
"CN=GPOD Test Defender for Endpoint,OU=User Groups,DC=org,DC=test,DC=local",
Expand Down Expand Up @@ -70,6 +80,10 @@
"RestrictedKrbHost/TEST12009.org.test.local",
"HOST/TEST12009.org.test.local"
],
"uac_list": [
"WORKSTATION_TRUST_ACCOUNT"
],
"user_account_control": "4096",
"when_changed": "2025-09-30T14:42:41Z",
"when_created": "2022-03-02T21:14:42Z"
},
Expand Down Expand Up @@ -154,6 +168,49 @@
},
"host": {
"domain": "org.test.local",
"entity": {
"attributes": {
"managed": true
},
"lifecycle": {
"last_activity": "2025-09-30T14:42:35.784Z"
},
"relationships": {
"administered_by": {
"domain": [
"org.test.local"
],
"id": [
"CN=Jane Smith,OU=IT,DC=org,DC=test,DC=local"
],
"name": [
"Jane Smith"
]
},
"owns": {
"domain": [
"org.test.local"
],
"id": [
"CN=SomeResource,OU=Resources,DC=org,DC=test,DC=local"
],
"name": [
"SomeResource"
]
},
"supervises": {
"domain": [
"org.test.local"
],
"id": [
"CN=SubDevice01,OU=Computers,DC=org,DC=test,DC=local"
],
"name": [
"SubDevice01"
]
}
}
},
"hostname": "TEST12009",
"name": "test12009.org.test.local",
"os": {
Expand Down
39 changes: 38 additions & 1 deletion packages/entityanalytics_ad/data_stream/entity/_dev/test/pipeline/test-user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,17 @@
"userAccountControl": "66048",
"userPrincipalName": "Administrator@testserver.local",
"whenChanged": "2024-03-27T04:30:09Z",
"whenCreated": "2024-01-22T06:36:59Z"
"whenCreated": "2024-01-22T06:36:59Z",
"directReports": [
"CN=Jane Smith,OU=Staff,DC=testserver,DC=local",
"CN=John Doe,OU=Staff,DC=testserver,DC=local"
],
"managedBy": [
"CN=Domain Admins,CN=Users,DC=testserver,DC=local"
],
"managedObjects": [
"CN=Workstation01,OU=Computers,DC=testserver,DC=local"
]
},
"whenChanged": "2024-03-27T04:30:09Z"
},
Expand Down Expand Up @@ -357,6 +367,33 @@
"id": "CN=krbtgt,CN=Users,DC=testserver,DC=local"
}
},
{
"@timestamp": "2024-03-27T21:30:18.981Z",
"activedirectory": {
"id": "CN=smartcard.user,CN=Users,DC=testserver,DC=local",
"user": {
"cn": "smartcard.user",
"distinguishedName": "CN=smartcard.user,CN=Users,DC=testserver,DC=local",
"objectGUID": "AAAAAAAAAAAAAAAAAAAAAA==",
"objectSid": "AQUAAAAAAAUVAAAA0JU2Fq1k30YZ7UPxZgIAAA==",
"sAMAccountName": "smartcard.user",
"sAMAccountType": "805306368",
"userAccountControl": "328192",
"whenChanged": "2024-03-27T04:30:09Z",
"whenCreated": "2024-01-22T06:36:59Z"
},
"whenChanged": "2024-03-27T04:30:09Z"
},
"event": {
"action": "user-discovered"
},
"labels": {
"identity_source": "entity-analytics-entityanalytics_ad.user-8c3c1f67-428d-4a95-a6de-69a2b8f952c3"
},
"user": {
"id": "CN=smartcard.user,CN=Users,DC=testserver,DC=local"
}
},
{
"@timestamp": "2024-03-27T21:30:18.980Z",
"event": {
Expand Down
125 changes: 125 additions & 0 deletions ...ges/entityanalytics_ad/data_stream/entity/_dev/test/pipeline/test-user.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@
"code_page": "0",
"country_code": "0",
"description": "Built-in account for administering the computer/domain",
"direct_reports": [
"CN=Jane Smith,OU=Staff,DC=testserver,DC=local",
"CN=John Doe,OU=Staff,DC=testserver,DC=local"
],
"distinguished_name": "CN=Administrator,CN=Users,DC=testserver,DC=local",
"ds_core_propagation_data": [
"2024-01-22T06:52:50Z",
Expand All @@ -196,6 +200,12 @@
"last_logon_timestamp": "2024-03-27T04:30:09.6399883Z",
"logon_count": "8",
"mail": "admin@testserver.local",
"managed_by": [
"CN=Domain Admins,CN=Users,DC=testserver,DC=local"
],
"managed_objects": [
"CN=Workstation01,OU=Computers,DC=testserver,DC=local"
],
"member_of": [
"CN=Group Policy Creator Owners,CN=Users,DC=testserver,DC=local",
"CN=Domain Admins,CN=Users,DC=testserver,DC=local",
Expand Down Expand Up @@ -262,6 +272,49 @@
},
"domain": "testserver.local",
"email": "admin@testserver.local",
"entity": {
"lifecycle": {
"last_activity": "2024-03-27T04:30:09.639Z"
},
"relationships": {
"administered_by": {
"domain": [
"testserver.local"
],
"id": [
"CN=Domain Admins,CN=Users,DC=testserver,DC=local"
],
"name": [
"Domain Admins"
]
},
"owns": {
"domain": [
"testserver.local"
],
"id": [
"CN=Workstation01,OU=Computers,DC=testserver,DC=local"
],
"name": [
"Workstation01"
]
},
"supervises": {
"domain": [
"testserver.local",
"testserver.local"
],
"id": [
"CN=Jane Smith,OU=Staff,DC=testserver,DC=local",
"CN=John Doe,OU=Staff,DC=testserver,DC=local"
],
"name": [
"Jane Smith",
"John Doe"
]
}
}
},
"group": {
"id": [
"S-1-5-21-372676048-1189045421-4047760665-520",
Expand Down Expand Up @@ -522,6 +575,78 @@
"name": "krbtgt"
}
},
{
"@timestamp": "2024-03-27T21:30:18.981Z",
"asset": {
"category": "entity",
"create_date": "2024-01-22T06:36:59.000Z",
"id": "S-1-5-21-372676048-1189045421-4047760665-614",
"last_updated": "2024-03-27T04:30:09.000Z",
"name": "smartcard.user",
"type": "activedirectory_user"
},
"data_stream": {
"dataset": "entityanalytics_ad.user",
"namespace": "default",
"type": "logs"
},
"ecs": {
"version": "8.11.0"
},
"entityanalytics_ad": {
"user": {
"cn": "smartcard.user",
"distinguished_name": "CN=smartcard.user,CN=Users,DC=testserver,DC=local",
"enabled": true,
"object_dn": "CN=smartcard.user,CN=Users,DC=testserver,DC=local",
"object_guid": "00000000-0000-0000-0000-000000000000",
"object_sid": "S-1-5-21-372676048-1189045421-4047760665-614",
"sam_account_name": "smartcard.user",
"sam_account_type": "805306368",
"uac_list": [
"DONT_EXPIRE_PASSWORD",
"NORMAL_ACCOUNT",
"SMARTCARD_REQUIRED"
],
"user_account_control": "328192",
"when_changed": "2024-03-27T04:30:09Z",
"when_created": "2024-01-22T06:36:59Z"
},
"when_changed": "2024-03-27T04:30:09Z"
},
"event": {
"category": [
"iam"
],
"kind": "asset",
"type": [
"info"
]
},
"labels": {
"identity_source": "entity-analytics-entityanalytics_ad.user-8c3c1f67-428d-4a95-a6de-69a2b8f952c3"
},
"related": {
"user": [
"smartcard.user",
"CN=smartcard.user,CN=Users,DC=testserver,DC=local",
"00000000-0000-0000-0000-000000000000"
]
},
"tags": [
"preserve_duplicate_custom_fields"
],
"user": {
"domain": "testserver.local",
"entity": {
"attributes": {
"mfa_enabled": true
}
},
"id": "S-1-5-21-372676048-1189045421-4047760665-614",
"name": "smartcard.user"
}
},
{
"@timestamp": "2024-03-27T21:30:18.980Z",
"asset": {
Expand Down
3 changes: 3 additions & 0 deletions packages/entityanalytics_ad/data_stream/entity/elasticsearch/ingest_pipeline/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ processors:
"uSNCreated": "usn_created"
"whenChanged": "when_changed"
"whenCreated": "when_created"
"directReports": "direct_reports"
"managedBy": "managed_by"
"managedObjects": "managed_objects"
tag: painless_to_rename_fields_under_activedirectory_groups
source: |
String hexByte(Byte b) {
Expand Down
Loading
Loading