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

Jump to bottom

[sophos_central] Fix timestamp parsing and update package-spec version to 2.7.0 #6309

Merged
merged 2 commits into from
May 30, 2023
Merged

[sophos_central] Fix timestamp parsing and update package-spec version to 2.7.0 #6309

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
0058e30
[sophos_central] Fix timestamp parsing and update package-spec versio…
taylor-swanson May 24, 2023
871a613
Changelog
taylor-swanson May 24, 2023
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/sophos_central/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.3.0"
changes:
- description: Fix timestamp parsing and update package-spec version to 2.7.0.
type: bugfix
link: https://github.com/elastic/integrations/pull/6309
- version: "1.2.1"
changes:
- description: Handle failure for grok pattern.
Expand Down
22 changes: 11 additions & 11 deletions ...hos_central/data_stream/alert/_dev/test/pipeline/test-pipeline-activity.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"total_items": 1
},
"created_at": "2023-01-01T00:00:00.085Z",
"created_at": "2022-11-24T07:07:52.085Z",
"endpoint": {
"id": "0320820b-84b4-41ea-95fd-5893fb17e420",
"java_id": "0320820b-84b4-41ea-95fd-5893fb17e420",
Expand All @@ -81,7 +81,7 @@
"uid": "344b9a0b-2271-0e14-0c61-0fa89122c6ad",
"version": "2.13.7"
},
"inserted_at": "2023-01-01T00:00:00.085Z",
"inserted_at": "2022-11-24T07:07:52.085Z",
"ips_threat": {
"detection_type": 1,
"executable": {
Expand Down Expand Up @@ -118,28 +118,28 @@
},
"tech_support_id": "2019052901.77863414.5"
},
"make_actionable_at": "2023-01-01T00:00:00.751Z",
"make_actionable_at": "2023-01-24T04:11:59.751Z",
"policy_type": 30,
"source_app_id": "CORE",
"source_info_ip": "67.43.156.0",
"threat_id": {
"counter": 5044432,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-24T07:07:52.000Z",
"machine_identifier": 13006844,
"process_identifier": 3865,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-24T07:07:52.000Z",
"time_sec": "2022-11-24T07:07:52.000Z",
"timestamp": "2022-11-24T07:07:52.000Z"
},
"threat_status": "NONE",
"user_match_id": {
"counter": 5199272,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-03T08:15:33.000Z",
"machine_identifier": 14271215,
"process_identifier": 3997,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-03T08:15:33.000Z",
"time_sec": "2022-11-03T08:15:33.000Z",
"timestamp": "2022-11-03T08:15:33.000Z"
},
"user_match_uuid": {
"data": "SltcnDmTSoSky+G00P5iTQ==",
Expand Down
66 changes: 33 additions & 33 deletions ...s/sophos_central/data_stream/alert/_dev/test/pipeline/test-user-formats.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"total_items": 1
},
"created_at": "2023-01-01T00:00:00.085Z",
"created_at": "2022-11-24T07:07:52.085Z",
"endpoint": {
"id": "0320820b-84b4-41ea-95fd-5893fb17e420",
"java_id": "0320820b-84b4-41ea-95fd-5893fb17e420",
Expand All @@ -81,7 +81,7 @@
"uid": "344b9a0b-2271-0e14-0c61-0fa89122c6ad",
"version": "2.13.7"
},
"inserted_at": "2023-01-01T00:00:00.085Z",
"inserted_at": "2022-11-24T07:07:52.085Z",
"ips_threat": {
"detection_type": 1,
"executable": {
Expand Down Expand Up @@ -118,28 +118,28 @@
},
"tech_support_id": "2019052901.77863414.5"
},
"make_actionable_at": "2023-01-01T00:00:00.751Z",
"make_actionable_at": "2023-01-24T04:11:59.751Z",
"policy_type": 30,
"source_app_id": "CORE",
"source_info_ip": "67.43.156.0",
"threat_id": {
"counter": 5044432,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-24T07:07:52.000Z",
"machine_identifier": 13006844,
"process_identifier": 3865,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-24T07:07:52.000Z",
"time_sec": "2022-11-24T07:07:52.000Z",
"timestamp": "2022-11-24T07:07:52.000Z"
},
"threat_status": "NONE",
"user_match_id": {
"counter": 5199272,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-03T08:15:33.000Z",
"machine_identifier": 14271215,
"process_identifier": 3997,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-03T08:15:33.000Z",
"time_sec": "2022-11-03T08:15:33.000Z",
"timestamp": "2022-11-03T08:15:33.000Z"
},
"user_match_uuid": {
"data": "SltcnDmTSoSky+G00P5iTQ==",
Expand Down Expand Up @@ -239,7 +239,7 @@
],
"total_items": 1
},
"created_at": "2023-01-01T00:00:00.085Z",
"created_at": "2022-11-24T07:07:52.085Z",
"endpoint": {
"id": "0320820b-84b4-41ea-95fd-5893fb17e420",
"java_id": "0320820b-84b4-41ea-95fd-5893fb17e420",
Expand All @@ -261,7 +261,7 @@
"uid": "344b9a0b-2271-0e14-0c61-0fa89122c6ad",
"version": "2.13.7"
},
"inserted_at": "2023-01-01T00:00:00.085Z",
"inserted_at": "2022-11-24T07:07:52.085Z",
"ips_threat": {
"detection_type": 1,
"executable": {
Expand Down Expand Up @@ -298,28 +298,28 @@
},
"tech_support_id": "2019052901.77863414.5"
},
"make_actionable_at": "2023-01-01T00:00:00.751Z",
"make_actionable_at": "2023-01-24T04:11:59.751Z",
"policy_type": 30,
"source_app_id": "CORE",
"source_info_ip": "67.43.156.0",
"threat_id": {
"counter": 5044432,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-24T07:07:52.000Z",
"machine_identifier": 13006844,
"process_identifier": 3865,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-24T07:07:52.000Z",
"time_sec": "2022-11-24T07:07:52.000Z",
"timestamp": "2022-11-24T07:07:52.000Z"
},
"threat_status": "NONE",
"user_match_id": {
"counter": 5199272,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-03T08:15:33.000Z",
"machine_identifier": 14271215,
"process_identifier": 3997,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-03T08:15:33.000Z",
"time_sec": "2022-11-03T08:15:33.000Z",
"timestamp": "2022-11-03T08:15:33.000Z"
},
"user_match_uuid": {
"data": "SltcnDmTSoSky+G00P5iTQ==",
Expand Down Expand Up @@ -415,7 +415,7 @@
],
"total_items": 1
},
"created_at": "2023-01-01T00:00:00.085Z",
"created_at": "2022-11-24T07:07:52.085Z",
"endpoint": {
"id": "0320820b-84b4-41ea-95fd-5893fb17e420",
"java_id": "0320820b-84b4-41ea-95fd-5893fb17e420",
Expand All @@ -437,7 +437,7 @@
"uid": "344b9a0b-2271-0e14-0c61-0fa89122c6ad",
"version": "2.13.7"
},
"inserted_at": "2023-01-01T00:00:00.085Z",
"inserted_at": "2022-11-24T07:07:52.085Z",
"ips_threat": {
"detection_type": 1,
"executable": {
Expand Down Expand Up @@ -474,28 +474,28 @@
},
"tech_support_id": "2019052901.77863414.5"
},
"make_actionable_at": "2023-01-01T00:00:00.751Z",
"make_actionable_at": "2023-01-24T04:11:59.751Z",
"policy_type": 30,
"source_app_id": "CORE",
"source_info_ip": "67.43.156.0",
"threat_id": {
"counter": 5044432,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-24T07:07:52.000Z",
"machine_identifier": 13006844,
"process_identifier": 3865,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-24T07:07:52.000Z",
"time_sec": "2022-11-24T07:07:52.000Z",
"timestamp": "2022-11-24T07:07:52.000Z"
},
"threat_status": "NONE",
"user_match_id": {
"counter": 5199272,
"date": "2023-01-01T00:00:00.000Z",
"date": "2022-11-03T08:15:33.000Z",
"machine_identifier": 14271215,
"process_identifier": 3997,
"time": "2023-01-01T00:00:00.000Z",
"time_sec": "2023-01-01T00:00:00.000Z",
"timestamp": "2023-01-01T00:00:00.000Z"
"time": "2022-11-03T08:15:33.000Z",
"time_sec": "2022-11-03T08:15:33.000Z",
"timestamp": "2022-11-03T08:15:33.000Z"
},
"user_match_uuid": {
"data": "SltcnDmTSoSky+G00P5iTQ==",
Expand Down
22 changes: 11 additions & 11 deletions packages/sophos_central/data_stream/alert/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ processors:
target_field: sophos_central.alert.data.inserted_at
if: ctx.json?.data?.inserted_at != null
formats:
- epoch_millis
- UNIX_MS
on_failure:
- append:
field: error.message
Expand Down Expand Up @@ -386,7 +386,7 @@ processors:
target_field: sophos_central.alert.data.threat_id.timestamp
if: ctx.json?.data?.threat_id?.timestamp != null
formats:
- epoch_second
- UNIX
on_failure:
- append:
field: error.message
Expand Down Expand Up @@ -423,7 +423,7 @@ processors:
target_field: sophos_central.alert.data.threat_id.time
if: ctx.json?.data?.threat_id?.time != null
formats:
- epoch_millis
- UNIX_MS
on_failure:
- append:
field: error.message
Expand All @@ -433,7 +433,7 @@ processors:
target_field: sophos_central.alert.data.threat_id.date
if: ctx.json?.data?.threat_id?.date != null
formats:
- epoch_second
- UNIX_MS
on_failure:
- append:
field: error.message
Expand All @@ -443,7 +443,7 @@ processors:
target_field: sophos_central.alert.data.threat_id.time_sec
if: ctx.json?.data?.threat_id?.timeSecond != null
formats:
- epoch_second
- UNIX
on_failure:
- append:
field: error.message
Expand All @@ -457,7 +457,7 @@ processors:
target_field: sophos_central.alert.data.user_match_id.timestamp
if: ctx.json?.data?.user_match_id?.timestamp != null
formats:
- epoch_second
- UNIX
on_failure:
- append:
field: error.message
Expand Down Expand Up @@ -494,7 +494,7 @@ processors:
target_field: sophos_central.alert.data.user_match_id.time
if: ctx.json?.data?.user_match_id?.time != null
formats:
- epoch_millis
- UNIX_MS
on_failure:
- append:
field: error.message
Expand All @@ -504,7 +504,7 @@ processors:
target_field: sophos_central.alert.data.user_match_id.date
if: ctx.json?.data?.threat_id?.date != null
formats:
- epoch_millis
- UNIX_MS
on_failure:
- append:
field: error.message
Expand All @@ -514,7 +514,7 @@ processors:
target_field: sophos_central.alert.data.user_match_id.time_sec
if: ctx.json?.data?.user_match_id?.timeSecond != null
formats:
- epoch_second
- UNIX
on_failure:
- append:
field: error.message
Expand All @@ -524,7 +524,7 @@ processors:
target_field: sophos_central.alert.data.created_at
if: ctx.json?.data?.created_at != null
formats:
- epoch_millis
- UNIX_MS
on_failure:
- append:
field: error.message
Expand Down Expand Up @@ -581,7 +581,7 @@ processors:
target_field: sophos_central.alert.data.make_actionable_at
if: ctx.json?.data?.make_actionable_at != null
formats:
- epoch_millis
- UNIX_MS
on_failure:
- append:
field: error.message
Expand Down
Loading