Skip to content

[windows] Drop unset fields in sysmon_operational data stream #3283

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
adriansr merged 5 commits into from
May 9, 2022
Merged

[windows] Drop unset fields in sysmon_operational data stream #3283

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f1ba53
Sample event
adriansr May 5, 2022
9fccab6
Drop "-" fields
adriansr May 5, 2022
ef2e9ac
Update version
adriansr May 5, 2022
d1be3a5
Fix
adriansr May 5, 2022
7a0b852
Drop zero-GUIDS and simplify conditionals
adriansr May 6, 2022
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/windows/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.12.1"
changes:
- description: Drop unset fields in sysmon_operational data stream.
type: bugfix
link: https://github.com/elastic/integrations/pull/3283
- version: "1.12.0"
changes:
- description: Support for Sysmon Registry non-QWORD/DWORD events
Expand Down
57 changes: 57 additions & 0 deletions packages/windows/data_stream/sysmon_operational/_dev/test/pipeline/test-events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8956,6 +8956,63 @@
"log": {
"level": "information"
}
},
{
"@timestamp": "2021-05-05T15:30:52.731Z",
"winlog": {
"event_id": "1",
"level": "information",
"computer_name": "vagrant-2012-r2",
"opcode": "Info",
"provider_guid": "{9990385f-c22a-43e0-bf4c-06f5698ffbd9}",
"version": 5,
"time_created": "2022-01-24T05:12:52.04227Z",
"channel": "Microsoft-Windows-Sysmon/Operational",
"provider_name": "Microsoft-Windows-Sysmon",
"record_id": 3,
"user": {
"identifier": "S-1-5-18"
},
"event_data": {
"RuleName": "-",
"UtcTime": "2022-04-27 18:13:46.501",
"ProcessGuid": "{34B92076-87DA-6269-16EE-240000002800}",
"ProcessId": "8232",
"Image": "C:\\Windows\\System32\\cmd.exe",
"FileVersion": "10.0.14393.0 (rs1_release.160715-1616)",
"Description": "Windows Command Processor",
"Product": "Microsoft® Windows® Operating System",
"Company": "Microsoft Corporation",
"OriginalFileName": "Cmd.Exe",
"CommandLine": "\u0026quot;C:\\Windows\\system32\\cmd.exe\u0026quot; /c SQLCMD -S \u0026quot;X\u0026quot; -h -1 -Q \u0026quot;EXEC DBA.dbo.AGSYNC_ALERT\u0026quot; \u0026gt; C:\\tmp\\SQL_ASYNCMonitor.txt",
"CurrentDirectory": "C:\\Windows\\system32\\",
"User": "DOMAIN\\user",
"LogonGuid": "{99999999-3A6F-6235-680C-030000000000}",
"LogonId": "0x30c68",
"TerminalSessionId": "0",
"IntegrityLevel": "High",
"Hashes": "MD5=999999996175B77E0C3A000549D2922C,SHA256=935C1861DF1F4018D698E8B65ABFA02D7E9037D8F68CA3C2065B6CA165D44AD2",
"ParentProcessGuid": "{00000000-0000-0000-0000-000000000000}",
"ParentProcessId": "5060",
"ParentImage": "-",
"ParentCommandLine": "-",
"ParentUser": "-"
},
"process": {
"pid": 4860,
"thread": {
"id": 4516
}
}
},
"log": {
"level": "information"
},
"event": {
"code": "1",
"kind": "event",
"provider": "Microsoft-Windows-Sysmon"
}
}
]
}
102 changes: 102 additions & 0 deletions .../windows/data_stream/sysmon_operational/_dev/test/pipeline/test-events.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22000,6 +22000,108 @@
},
"version": 2
}
},
{
"@timestamp": "2022-04-27T18:13:46.501Z",
"ecs": {
"version": "8.0.0"
},
"event": {
"category": [
"process"
],
"code": "1",
"created": "2022-01-24T05:12:52.042Z",
"kind": "event",
"provider": "Microsoft-Windows-Sysmon",
"type": [
"start"
]
},
"log": {
"level": "information"
},
"process": {
"args": [
"\u0026quot;C:\\Windows\\system32\\cmd.exe\u0026quot;",
"/c",
"SQLCMD",
"-S",
"\u0026quot;X\u0026quot;",
"-h",
"-1",
"-Q",
"\u0026quot;EXEC",
"DBA.dbo.AGSYNC_ALERT\u0026quot;",
"\u0026gt;",
"C:\\tmp\\SQL_ASYNCMonitor.txt"
],
"args_count": 12,
"command_line": "\u0026quot;C:\\Windows\\system32\\cmd.exe\u0026quot; /c SQLCMD -S \u0026quot;X\u0026quot; -h -1 -Q \u0026quot;EXEC DBA.dbo.AGSYNC_ALERT\u0026quot; \u0026gt; C:\\tmp\\SQL_ASYNCMonitor.txt",
"entity_id": "{34B92076-87DA-6269-16EE-240000002800}",
"executable": "C:\\Windows\\System32\\cmd.exe",
"hash": {
"md5": "999999996175b77e0c3a000549d2922c",
"sha256": "935c1861df1f4018d698e8b65abfa02d7e9037d8f68ca3c2065b6ca165d44ad2"
},
"name": "cmd.exe",
"parent": {
"entity_id": "{00000000-0000-0000-0000-000000000000}",

@efd6 efd6 May 5, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do we want to drop zero UUIDs as well?

@adriansr adriansr May 6, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Makes sense

"pid": 5060
},
"pe": {
"company": "Microsoft Corporation",
"description": "Windows Command Processor",
"file_version": "10.0.14393.0 (rs1_release.160715-1616)",
"original_file_name": "Cmd.Exe",
"product": "Microsoft® Windows® Operating System"
},
"pid": 8232,
"working_directory": "C:\\Windows\\system32\\"
},
"related": {
"hash": [
"935c1861df1f4018d698e8b65abfa02d7e9037d8f68ca3c2065b6ca165d44ad2",
"999999996175b77e0c3a000549d2922c"
],
"user": [
"user"
]
},
"user": {
"domain": "DOMAIN",
"id": "S-1-5-18",
"name": "user"
},
"winlog": {
"channel": "Microsoft-Windows-Sysmon/Operational",
"computer_name": "vagrant-2012-r2",
"event_data": {
"Company": "Microsoft Corporation",
"Description": "Windows Command Processor",
"FileVersion": "10.0.14393.0 (rs1_release.160715-1616)",
"IntegrityLevel": "High",
"LogonGuid": "{99999999-3A6F-6235-680C-030000000000}",
"LogonId": "0x30c68",
"Product": "Microsoft® Windows® Operating System",
"TerminalSessionId": "0"
},
"event_id": "1",
"opcode": "Info",
"process": {
"pid": 4860,
"thread": {
"id": 4516
}
},
"provider_guid": "{9990385f-c22a-43e0-bf4c-06f5698ffbd9}",
"provider_name": "Microsoft-Windows-Sysmon",
"record_id": "3",
"user": {
"identifier": "S-1-5-18"
},
"version": 5
}
}
]
}
8 changes: 4 additions & 4 deletions packages/windows/data_stream/sysmon_operational/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ processors:
- set:
field: ecs.version
value: '8.0.0'
- script:
description: Remove all empty values from event_data.
lang: painless
source: ctx?.winlog?.event_data?.entrySet().removeIf(entry -> entry.getValue() == null || entry.getValue().equals("") || entry.getValue().equals("-"));
- rename:
field: winlog.level
target_field: log.level
Expand Down Expand Up @@ -1257,10 +1261,6 @@ processors:
- winlog.level
ignore_failure: true
ignore_missing: true
- script:
description: Remove all empty values from event_data.
lang: painless
source: ctx?.winlog?.event_data?.entrySet().removeIf(entry -> entry.getValue() == null || entry.getValue().equals("") || entry.getValue().equals("-"));
- remove:
description: Remove empty event data.
field: winlog.event_data
Expand Down
2 changes: 1 addition & 1 deletion packages/windows/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: windows
title: Windows
version: 1.12.0
version: 1.12.1
description: Collect logs and metrics from Windows OS and services with Elastic Agent.
type: integration
categories:
Expand Down