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

Cherry-pick #20976 to 7.x: [Filebeat][santa] Map x509 fields in santa module #21016

Merged
merged 1 commit into from
Sep 9, 2020
Merged

Cherry-pick #20976 to 7.x: [Filebeat][santa] Map x509 fields in santa module #21016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -639,6 +639,7 @@ field. You can revert this change by configuring tags for the module and omittin
- Improve Zeek SSL module with `x509` ECS mappings {pull}20927[20927]
- Improve Zeek Kerberos module with `x509` ECS mappings {pull}20958[20958]
- Improve Fortinet firewall module with `x509` ECS mappings {pull}20983[20983]
Copy link
Contributor

Choose a reason for hiding this comment

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

looks like cherry_pick script picked up an extra Changelog line

- Improve Santa module with `x509` ECS mappings {pull}20976[20976]

*Heartbeat*

Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/santa/log/config/file.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ processors:
- add_fields:
target: ''
fields:
ecs.version: 1.5.0
ecs.version: 1.6.0
4 changes: 4 additions & 0 deletions filebeat/module/santa/log/ingest/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ processors:
field: related.hash
value: "{{process.hash.sha256}}"
if: "ctx?.process?.hash != null"
- set:
field: file.x509.issuer.common_name
value: "{{santa.certificate.common_name}}"
ignore_empty_value: true
on_failure:
- set:
field: error.message
Expand Down
8 changes: 8 additions & 0 deletions filebeat/module/santa/log/test/santa.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Software Signing",
"fileset.name": "log",
"group.id": "0",
"group.name": "wheel",
Expand Down Expand Up @@ -58,6 +59,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Software Signing",
"fileset.name": "log",
"group.id": "0",
"group.name": "wheel",
Expand Down Expand Up @@ -105,6 +107,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Software Signing",
"fileset.name": "log",
"group.id": "0",
"group.name": "wheel",
Expand Down Expand Up @@ -151,6 +154,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Software Signing",
"fileset.name": "log",
"group.id": "0",
"group.name": "wheel",
Expand Down Expand Up @@ -198,6 +202,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Software Signing",
"fileset.name": "log",
"group.id": "0",
"group.name": "wheel",
Expand Down Expand Up @@ -244,6 +249,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Software Signing",
"fileset.name": "log",
"group.id": "0",
"group.name": "wheel",
Expand Down Expand Up @@ -336,6 +342,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Software Signing",
"fileset.name": "log",
"group.id": "20",
"group.name": "staff",
Expand Down Expand Up @@ -381,6 +388,7 @@
"event.type": [
"start"
],
"file.x509.issuer.common_name": "Developer ID Application: Google, Inc. (EQHXZ8M8AV)",
"fileset.name": "log",
"group.id": "20",
"group.name": "staff",
Expand Down