Skip to content

[mimecast] Add 8.0.0 compatibility #2683

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
andrewkroh merged 2 commits into from
Feb 22, 2022
Merged

[mimecast] Add 8.0.0 compatibility #2683

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
be585dd
mimecast - Add 8.0.0 compatibility
andrewkroh Feb 11, 2022
dac2175
Merge branch 'main' into mimecast/8-0-compat
andrewkroh Feb 15, 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
3 changes: 3 additions & 0 deletions packages/mimecast/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
- description: Fix typo
type: bugfix
link: https://github.com/elastic/integrations/pull/2644
- description: Add 8.0.0 compatibility, fix team name in manifest, and remove redundant `event.ingested` from pipelines.
type: bugfix
link: https://github.com/elastic/integrations/pull/2683
- version: "0.0.4"
changes:
- description: Regenerate test files using the new GeoIP database
Expand Down
1,355 changes: 665 additions & 690 deletions .../mimecast/data_stream/audit_events/_dev/test/pipeline/test-audit-events.log-expected.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions packages/mimecast/data_stream/audit_events/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
3 changes: 0 additions & 3 deletions packages/mimecast/data_stream/audit_events/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
description: Pipeline for processing sample logs
processors:
# # Generic event/ecs fields we always want to populate
- set:
field: event.ingested
value: "{{ _ingest.timestamp }}"
- set:
field: ecs.version
value: "1.12.0"
Copy link
Contributor

@efd6 efd6 Feb 13, 2022

Choose a reason for hiding this comment

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

Is mimecast not moving to ECS 8.0.0? (all data_stream/*/elasticsearch/ingest_pipeline/default.yml)

Copy link
Member Author

@andrewkroh andrewkroh Feb 15, 2022

Choose a reason for hiding this comment

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

It should. I guess we missed it. @r00tu53r any reason this one got skipped? Maybe it merged in the middle of the update process.

In any case I think we can upgrade this package to ECS 8.0.0 independently of stack 8.0.0.

Expand Down
2 changes: 0 additions & 2 deletions packages/mimecast/data_stream/dlp_logs/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
230 changes: 110 additions & 120 deletions packages/mimecast/data_stream/dlp_logs/_dev/test/pipeline/test-dlp-logs.log-expected.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions packages/mimecast/data_stream/dlp_logs/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
description: Pipeline for processing sample logs
processors:
# Generic event/ecs fields we always want to populated
- set:
field: event.ingested
value: "{{ _ingest.timestamp }}"
- set:
field: ecs.version
value: "1.12.0"
Expand Down
2 changes: 0 additions & 2 deletions packages/mimecast/data_stream/siem_logs/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
307 changes: 150 additions & 157 deletions packages/mimecast/data_stream/siem_logs/_dev/test/pipeline/test-siem-logs.log-expected.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions packages/mimecast/data_stream/siem_logs/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
description: Pipeline for processing sample logs
processors:
# Generic event/ecs fields we always want to populated
- set:
field: event.ingested
value: "{{ _ingest.timestamp }}"
- set:
field: ecs.version
value: "1.12.0"
Expand Down
2 changes: 0 additions & 2 deletions ...ecast/data_stream/threat_intel_malware_customer/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
287 changes: 140 additions & 147 deletions ..._malware_customer/_dev/test/pipeline/test-threat-intel-malware-customer.log-expected.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions ...ecast/data_stream/threat_intel_malware_customer/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ processors:
####################
# Event ECS fields #
####################
- set:
field: event.ingested
value: "{{_ingest.timestamp}}"
- set:
field: ecs.version
value: "1.12"
Expand Down
2 changes: 0 additions & 2 deletions .../mimecast/data_stream/threat_intel_malware_grid/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
287 changes: 140 additions & 147 deletions ...at_intel_malware_grid/_dev/test/pipeline/test-threat-intel-malware-grid.log-expected.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions .../mimecast/data_stream/threat_intel_malware_grid/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ processors:
####################
# Event ECS fields #
####################
- set:
field: event.ingested
value: "{{_ingest.timestamp}}"
- set:
field: ecs.version
value: "1.12"
Expand Down
2 changes: 0 additions & 2 deletions packages/mimecast/data_stream/ttp_ap_logs/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
167 changes: 82 additions & 85 deletions ...es/mimecast/data_stream/ttp_ap_logs/_dev/test/pipeline/test-ttp-ap-logs.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,34 @@
"ecs": {
"version": "1.12.0"
},
"email": {
"attachments": {
"file": {
"extension": "pdf",
"mime_type": "application/pdf",
"name": "numbers.pdf"
},
"hash": "eaeef09b60a59b913e9bfc0a4373e25d6182beff388957473fba517cc09345e3"
},
"direction": "inbound",
"from": {
"address": "\u003c\u003e"
},
"message_id": "\u003c20200806044148.F35F813B435@mail.brianjthronton.com\u003e",
"subject": "Important Updated Numbers from the Center for Disease Control",
"to": {
"address": "johndoe@example.com"
}
},
"event": {
"action": "user_release_none",
"created": "2021-10-14T18:54:32+0000",
"original": "{\"senderAddress\":\"\u003c\u003e\",\"recipientAddress\":\"johndoe@example.com\",\"fileName\":\"numbers.pdf\",\"fileType\":\"application\\/pdf\",\"result\":\"safe\",\"actionTriggered\":\"user release, none\",\"date\":\"2021-10-14T18:54:32+0000\",\"details\":\"Safe \\r\\nTime taken: 0 hrs, 0 min, 4 sec\",\"route\":\"inbound\",\"messageId\":\"\u003c20200806044148.F35F813B435@mail.brianjthronton.com\u003e\",\"subject\":\"Important Updated Numbers from the Center for Disease Control\",\"fileHash\":\"eaeef09b60a59b913e9bfc0a4373e25d6182beff388957473fba517cc09345e3\",\"definition\":\"Inbound - Safe file with On-Demand Sandbox\"}"
},
"mimecast": {
"details": "Safe \r\nTime taken: 0 hrs, 0 min, 4 sec",
"result": "safe"
},
"related": {
"hash": [
"eaeef09b60a59b913e9bfc0a4373e25d6182beff388957473fba517cc09345e3"
Expand All @@ -13,43 +41,42 @@
"rule": {
"name": "Inbound - Safe file with On-Demand Sandbox"
},
"event": {
"action": "user_release_none",
"ingested": "2021-12-14T14:48:22.845496090Z",
"original": "{\"senderAddress\":\"\u003c\u003e\",\"recipientAddress\":\"johndoe@example.com\",\"fileName\":\"numbers.pdf\",\"fileType\":\"application\\/pdf\",\"result\":\"safe\",\"actionTriggered\":\"user release, none\",\"date\":\"2021-10-14T18:54:32+0000\",\"details\":\"Safe \\r\\nTime taken: 0 hrs, 0 min, 4 sec\",\"route\":\"inbound\",\"messageId\":\"\u003c20200806044148.F35F813B435@mail.brianjthronton.com\u003e\",\"subject\":\"Important Updated Numbers from the Center for Disease Control\",\"fileHash\":\"eaeef09b60a59b913e9bfc0a4373e25d6182beff388957473fba517cc09345e3\",\"definition\":\"Inbound - Safe file with On-Demand Sandbox\"}",
"created": "2021-10-14T18:54:32+0000"
"tags": [
"preserve_original_event"
]
},
{
"@timestamp": "2021-10-14T11:24:23.000Z",
"ecs": {
"version": "1.12.0"
},
"email": {
"from": {
"address": "\u003c\u003e"
},
"message_id": "\u003c20200806044148.F35F813B435@mail.brianjthronton.com\u003e",
"attachments": {
"hash": "eaeef09b60a59b913e9bfc0a4373e25d6182beff388957473fba517cc09345e3",
"file": {
"name": "numbers.pdf",
"mime_type": "application/pdf",
"extension": "pdf"
}
"extension": "docx",
"mime_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"name": "Titus-Test Doc - Classification - InternalUseOnly.docx"
},
"hash": "2fb26be55ac710e4d9f80677ba24ae212dbb36bd934a0569fe521839e9f5d16e"
},
"direction": "inbound",
"from": {
"address": "\u003c\u003e"
},
"message_id": "\u003cDB8P194MB0824EE4C8D360CCE3DEB0243A1B89@DB8P194MB0824.EURP194.PROD.OUTLOOK.COM\u003e",
"subject": "FW: Titus classification work",
"to": {
"address": "johndoe@example.com"
},
"subject": "Important Updated Numbers from the Center for Disease Control",
"direction": "inbound"
}
},
"event": {
"action": "user_release_none",
"created": "2021-10-14T11:24:23+0000",
"original": "{\"senderAddress\":\"\u003c\u003e\",\"recipientAddress\":\"johndoe@example.com\",\"fileName\":\"Titus-Test Doc - Classification - InternalUseOnly.docx\",\"fileType\":\"application\\/vnd.openxmlformats-officedocument.wordprocessingml.document\",\"result\":\"safe\",\"actionTriggered\":\"user release, none\",\"date\":\"2021-10-14T11:24:23+0000\",\"details\":\"Safe \\r\\nTime taken: 0 hrs, 0 min, 5 sec\",\"route\":\"inbound\",\"messageId\":\"\u003cDB8P194MB0824EE4C8D360CCE3DEB0243A1B89@DB8P194MB0824.EURP194.PROD.OUTLOOK.COM\u003e\",\"subject\":\"FW: Titus classification work\",\"fileHash\":\"2fb26be55ac710e4d9f80677ba24ae212dbb36bd934a0569fe521839e9f5d16e\",\"definition\":\"Inbound - Safe file with On-Demand Sandbox\"}"
},
"tags": [
"preserve_original_event"
],
"mimecast": {
"result": "safe",
"details": "Safe \r\nTime taken: 0 hrs, 0 min, 4 sec"
}
},
{
"@timestamp": "2021-10-14T11:24:23.000Z",
"ecs": {
"version": "1.12.0"
"details": "Safe \r\nTime taken: 0 hrs, 0 min, 5 sec",
"result": "safe"
},
"related": {
"hash": [
Expand All @@ -59,43 +86,42 @@
"rule": {
"name": "Inbound - Safe file with On-Demand Sandbox"
},
"event": {
"action": "user_release_none",
"ingested": "2021-12-14T14:48:22.845498572Z",
"original": "{\"senderAddress\":\"\u003c\u003e\",\"recipientAddress\":\"johndoe@example.com\",\"fileName\":\"Titus-Test Doc - Classification - InternalUseOnly.docx\",\"fileType\":\"application\\/vnd.openxmlformats-officedocument.wordprocessingml.document\",\"result\":\"safe\",\"actionTriggered\":\"user release, none\",\"date\":\"2021-10-14T11:24:23+0000\",\"details\":\"Safe \\r\\nTime taken: 0 hrs, 0 min, 5 sec\",\"route\":\"inbound\",\"messageId\":\"\u003cDB8P194MB0824EE4C8D360CCE3DEB0243A1B89@DB8P194MB0824.EURP194.PROD.OUTLOOK.COM\u003e\",\"subject\":\"FW: Titus classification work\",\"fileHash\":\"2fb26be55ac710e4d9f80677ba24ae212dbb36bd934a0569fe521839e9f5d16e\",\"definition\":\"Inbound - Safe file with On-Demand Sandbox\"}",
"created": "2021-10-14T11:24:23+0000"
"tags": [
"preserve_original_event"
]
},
{
"@timestamp": "2021-10-14T11:24:23.000Z",
"ecs": {
"version": "1.12.0"
},
"email": {
"attachments": {
"file": {
"extension": "pptx",
"mime_type": "application/vnd.openxmlformats-officedocument.presentationml",
"name": "Titus classification v0.3.pptx"
},
"hash": "111b86e1244ce6389efb60cddc001d594d334c540e85f9976be467a4ce472973"
},
"direction": "inbound",
"from": {
"address": "\u003c\u003e"
},
"message_id": "\u003cDB8P194MB0824EE4C8D360CCE3DEB0243A1B89@DB8P194MB0824.EURP194.PROD.OUTLOOK.COM\u003e",
"attachments": {
"hash": "2fb26be55ac710e4d9f80677ba24ae212dbb36bd934a0569fe521839e9f5d16e",
"file": {
"name": "Titus-Test Doc - Classification - InternalUseOnly.docx",
"mime_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"extension": "docx"
}
},
"subject": "FW: Titus classification work",
"to": {
"address": "johndoe@example.com"
},
"subject": "FW: Titus classification work",
"direction": "inbound"
}
},
"event": {
"action": "user_release_none",
"created": "2021-10-14T11:24:23+0000",
"original": "{\"senderAddress\":\"\u003c\u003e\",\"recipientAddress\":\"johndoe@example.com\",\"fileName\":\"Titus classification v0.3.pptx\",\"fileType\":\"application\\/vnd.openxmlformats-officedocument.presentationml\",\"result\":\"safe\",\"actionTriggered\":\"user release, none\",\"date\":\"2021-10-14T11:24:23+0000\",\"details\":\"Safe \\r\\nTime taken: 0 hrs, 0 min, 5 sec\",\"route\":\"inbound\",\"messageId\":\"\u003cDB8P194MB0824EE4C8D360CCE3DEB0243A1B89@DB8P194MB0824.EURP194.PROD.OUTLOOK.COM\u003e\",\"subject\":\"FW: Titus classification work\",\"fileHash\":\"111b86e1244ce6389efb60cddc001d594d334c540e85f9976be467a4ce472973\",\"definition\":\"Inbound - Safe file with On-Demand Sandbox\"}"
},
"tags": [
"preserve_original_event"
],
"mimecast": {
"result": "safe",
"details": "Safe \r\nTime taken: 0 hrs, 0 min, 5 sec"
}
},
{
"@timestamp": "2021-10-14T11:24:23.000Z",
"ecs": {
"version": "1.12.0"
"details": "Safe \r\nTime taken: 0 hrs, 0 min, 5 sec",
"result": "safe"
},
"related": {
"hash": [
Expand All @@ -105,38 +131,9 @@
"rule": {
"name": "Inbound - Safe file with On-Demand Sandbox"
},
"event": {
"action": "user_release_none",
"ingested": "2021-12-14T14:48:22.845499051Z",
"original": "{\"senderAddress\":\"\u003c\u003e\",\"recipientAddress\":\"johndoe@example.com\",\"fileName\":\"Titus classification v0.3.pptx\",\"fileType\":\"application\\/vnd.openxmlformats-officedocument.presentationml\",\"result\":\"safe\",\"actionTriggered\":\"user release, none\",\"date\":\"2021-10-14T11:24:23+0000\",\"details\":\"Safe \\r\\nTime taken: 0 hrs, 0 min, 5 sec\",\"route\":\"inbound\",\"messageId\":\"\u003cDB8P194MB0824EE4C8D360CCE3DEB0243A1B89@DB8P194MB0824.EURP194.PROD.OUTLOOK.COM\u003e\",\"subject\":\"FW: Titus classification work\",\"fileHash\":\"111b86e1244ce6389efb60cddc001d594d334c540e85f9976be467a4ce472973\",\"definition\":\"Inbound - Safe file with On-Demand Sandbox\"}",
"created": "2021-10-14T11:24:23+0000"
},
"email": {
"from": {
"address": "\u003c\u003e"
},
"message_id": "\u003cDB8P194MB0824EE4C8D360CCE3DEB0243A1B89@DB8P194MB0824.EURP194.PROD.OUTLOOK.COM\u003e",
"attachments": {
"hash": "111b86e1244ce6389efb60cddc001d594d334c540e85f9976be467a4ce472973",
"file": {
"name": "Titus classification v0.3.pptx",
"mime_type": "application/vnd.openxmlformats-officedocument.presentationml",
"extension": "pptx"
}
},
"to": {
"address": "johndoe@example.com"
},
"subject": "FW: Titus classification work",
"direction": "inbound"
},
"tags": [
"preserve_original_event"
],
"mimecast": {
"result": "safe",
"details": "Safe \r\nTime taken: 0 hrs, 0 min, 5 sec"
}
]
}
]
}
3 changes: 0 additions & 3 deletions packages/mimecast/data_stream/ttp_ap_logs/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
description: Pipeline for processing sample logs
processors:
# Generic event/ecs fields we always want to populated
- set:
field: event.ingested
value: "{{ _ingest.timestamp }}"
- set:
field: ecs.version
value: "1.12.0"
Expand Down
2 changes: 0 additions & 2 deletions packages/mimecast/data_stream/ttp_ip_logs/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
Loading