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.

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

[Filebeat] Improve ECS categorization field mappings in osquery module #17881

Merged
merged 3 commits into from
May 5, 2020

Conversation

leehinman
Copy link
Contributor

@leehinman leehinman commented Apr 21, 2020

What does this PR do?

Adds the following field mappings to osquery module:

  • event.action
  • event.kind
  • event.type
  • file.accessed
  • file.created
  • file.directory
  • file.gid
  • file.inode
  • file.mode
  • file.mtime
  • file.name
  • file.path
  • file.size
  • file.type
  • file.uid
  • host.hostname
  • host.id
  • process.name
  • related.user
  • rule.name
  • url.full
  • user.name

Why is it important?

Improve ECS field mappings makes data more useful in SIEM app and improves correlation between data sources.

Checklist

  • My code follows the style guidelines of this project
    - [ ] I have commented my code, particularly in hard-to-understand areas
    - [ ] I have made corresponding changes to the documentation
    - [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG.developer.next.asciidoc.

How to test this PR locally

TESTING_FILEBEAT_MODULES=osquery mage -v pythonIntegTest

Related issues

Closes #16176

@leehinman leehinman added enhancement Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:SIEM ecs labels Apr 21, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

- event.action
- event.kind
- event.type
- file.accessed
- file.created
- file.directory
- file.gid
- file.inode
- file.mode
- file.mtime
- file.name
- file.path
- file.size
- file.type
- file.uid
- host.hostname
- host.id
- process.name
- related.user
- rule.name
- url.full
- user.name

Closes elastic#16176
@leehinman leehinman force-pushed the 16176_osquery_ecs_1.4 branch from 1fb8df5 to ebae871 Compare April 21, 2020 18:31
"set": {
"field": "user.name",
"value": "{{osquery.result.decorations.username}}",
"if": "ctx?.osquery?.result?.decorations?.uusername != null"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"if": "ctx?.osquery?.result?.decorations?.uusername != null"
"if": "ctx?.osquery?.result?.decorations?.username != null"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

doh! Thanks for catching that.

@leehinman leehinman force-pushed the 16176_osquery_ecs_1.4 branch from dae0f7e to cdd3833 Compare May 5, 2020 14:31
@leehinman leehinman merged commit 282b084 into elastic:master May 5, 2020
@leehinman leehinman deleted the 16176_osquery_ecs_1.4 branch May 5, 2020 14:34
@leehinman leehinman added v7.8.0 and removed needs_backport PR is waiting to be backported to other branches. labels May 5, 2020
leehinman added a commit to leehinman/beats that referenced this pull request May 5, 2020
elastic#17881)

* Improve ECS categorization field mappings in osquery module

- event.action
- event.kind
- event.type
- file.accessed
- file.created
- file.directory
- file.gid
- file.inode
- file.mode
- file.mtime
- file.name
- file.path
- file.size
- file.type
- file.uid
- host.hostname
- host.id
- process.name
- related.user
- rule.name
- url.full
- user.name

Closes elastic#16176

* Fix misspelling of username & set ECS version

(cherry picked from commit 282b084)
leehinman added a commit to leehinman/beats that referenced this pull request May 5, 2020
PR 17881 didn't have updated golden files for osquery.
This updates them.

Related elastic#17881
leehinman added a commit that referenced this pull request May 5, 2020
PR 17881 didn't have updated golden files for osquery.
This updates them.

Related #17881
leehinman added a commit that referenced this pull request May 5, 2020
…d mappings in osquery module (#18245)

* [Filebeat] Improve ECS categorization field mappings in osquery module (#17881)

* Improve ECS categorization field mappings in osquery module

- event.action
- event.kind
- event.type
- file.accessed
- file.created
- file.directory
- file.gid
- file.inode
- file.mode
- file.mtime
- file.name
- file.path
- file.size
- file.type
- file.uid
- host.hostname
- host.id
- process.name
- related.user
- rule.name
- url.full
- user.name

Closes #16176

* Fix misspelling of username & set ECS version

(cherry picked from commit 282b084)

* Update golden files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Filebeat] Upgrade osquery module to ECS 1.4
3 participants