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

Non-breaking adjustment of osquery Filebeat module to ECS #10088

Closed
wants to merge 5 commits into from

Conversation

webmat
Copy link
Contributor

@webmat webmat commented Jan 15, 2019

No breaking field transitions, as these results are all userland data (directly based on user queries).

Rename

  • read_timestamp => event.created

Fields copied out to ECS

  • osquery.result.decorations.host_uuid => host.id
  • osquery.result.host_identifier => host.hostname
  • osquery.result.decorations.username => user.name

Also

  • Innocuous typo in the fields.yml
  • Changelog

@webmat webmat requested a review from a team as a code owner January 15, 2019 18:29
@webmat webmat self-assigned this Jan 15, 2019
@ruflin ruflin mentioned this pull request Jan 15, 2019
@webmat
Copy link
Contributor Author

webmat commented Jan 15, 2019

@ruflin This one will annoy you as well. Non-breaking change, because since the OSQuery module reads "userland" data (directly related to their query), I'm copying out a few bit of info without renaming anything.

@webmat webmat requested a review from a team as a code owner January 15, 2019 19:01
@ruflin
Copy link
Member

ruflin commented Jan 16, 2019

As discussed in the other PR, let's not do this and rely on aliases.

@webmat
Copy link
Contributor Author

webmat commented Jan 16, 2019

@ruflin Ready for a quick review. No breaking changes here. Test failures unrelated (heartbeat and libbeat)

@webmat webmat requested a review from ruflin January 16, 2019 15:29
@ruflin
Copy link
Member

ruflin commented Jan 16, 2019

@webmat See other PR for the comments related to alias. We should go with alias instead of copying.

@webmat
Copy link
Contributor Author

webmat commented Jan 16, 2019

@ruflin Are you saying we should move the data to the ECS field name, and put in place an alias inside the user's query result objects towards the ECS name?

@tsg How were these events generated, by the way? The /test/ log examples don't look like answers to ad hoc queries. It looks more like the result of some structured sets of queries. Are the following fields expected to be present most of the time? .host_identifier, .decorations.host_uuid and .decorations.username

@ruflin
Copy link
Member

ruflin commented Jan 17, 2019

@webmat I'm suggestion we do here the same as for all other modules.

@exekias exekias removed the request for review from a team November 22, 2019 10:56
@mergify
Copy link
Contributor

mergify bot commented Apr 7, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b ecs-osquery-fb upstream/ecs-osquery-fb
git merge upstream/master
git push upstream ecs-osquery-fb

@urso urso closed this Apr 7, 2021
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.

3 participants