Skip to content
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

Resolved timestamp for defender atp #28272

Merged
merged 3 commits into from
Oct 7, 2021
Merged

Resolved timestamp for defender atp #28272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60478cf
Resolved timestamp for defender atp
r00tu53r Oct 6, 2021
78cf129
update changelog for 28272
r00tu53r Oct 6, 2021
2b1f3e9
Merge remote-tracking branch 'upstream/master' into fix/defender-atp
r00tu53r Oct 6, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update indentation for azure filebeat configuration. {pull}26604[26604]
- Update Sophos xg module pipeline to deal with missing `date` and `time` fields. {pull}27834[27834]
- sophos/xg fileset: Add missing pipeline for System Health logs. {pull}27827[27827] {issue}27826[27826]
- Resolve issue with @timestamp for defender_atp. {pull}28272[28272]
- Tolerate faults when Windows Event Log session is interrupted {issue}27947[27947] {pull}28191[28191]

*Heartbeat*
Expand Down
1 change: 0 additions & 1 deletion filebeat/tests/system/test_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ def clean_keys(obj):
"symantec.endpointprotection",
"system.auth",
"system.syslog",
"microsoft.defender_atp",
"crowdstrike.falcon_endpoint",
"crowdstrike.falcon_audit",
"zoom.webhook",
Expand Down
9 changes: 5 additions & 4 deletions x-pack/filebeat/module/microsoft/defender_atp/ingest/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ processors:
- set:
field: cloud.provider
value: azure
- set:
field: '@timestamp'
value: '{{json.alertUpdateTime}}'
if: ctx.json?.alertUpdateTime != null
- date:
field: json.lastUpdateTime
formats:
- ISO8601
if: ctx.json?.lastUpdateTime != null
- rename:
field: json.aadTenantId
target_field: cloud.account.id
Expand Down
4 changes: 4 additions & 0 deletions x-pack/filebeat/module/microsoft/defender_atp/test/defender_atp-test.json.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[
{
"@timestamp": "2020-07-03T15:15:39.130Z",
"cloud.account.id": "123543-d66c-4c7e-9e30-40034eb7c6f3",
"cloud.instance.id": "c5a964f417c11f6277d5bf9489f0d",
"cloud.provider": "azure",
Expand Down Expand Up @@ -53,6 +54,7 @@
"threat.technique.name": "Malware"
},
{
"@timestamp": "2020-06-30T15:29:44.773Z",
"cloud.account.id": "123543-d66c-4c7e-9e30-40034eb7c6f3",
"cloud.instance.id": "543bc5a964f417c11f6277d5bf9489f0d",
"cloud.provider": "azure",
Expand Down Expand Up @@ -123,6 +125,7 @@
"user.name": "administrator1"
},
{
"@timestamp": "2020-06-30T15:29:44.773Z",
"cloud.account.id": "43521344-d66c-4c7e-9e30-40034eb7c6f3",
"cloud.instance.id": "53425a964f417c11f6277d5bf9489f0d",
"cloud.provider": "azure",
Expand Down Expand Up @@ -184,6 +187,7 @@
"user.name": "administrator1"
},
{
"@timestamp": "2020-06-30T11:13:12.900Z",
"cloud.account.id": "1234543-d66c-4c7e-9e30-40034eb7c6f3",
"cloud.instance.id": "t4563234bc5a964f417c11f6277d5bf9489f0d",
"cloud.provider": "azure",
Expand Down