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

Finish importing ECS Beta 2 differences #9738

Merged
merged 2 commits into from
Dec 21, 2018
Merged

Conversation

webmat
Copy link
Contributor

@webmat webmat commented Dec 21, 2018

This PR doesn't address the updates to HTTP, which are updated by #9645.

Changes:

  • client/server, source/destination
    • Update each field set's definition
    • Add the .address field (except for source, which already had it)
  • network: update definitions and examples wrt lowercase directive
  • user_agent.original index is now keyword indexed (See Index user_agent.original, after all. ecs#262)
  • Update ecs.version example <= this is of staggering importance! Just kidding

TODO

  • make check fails, no wonder
  • Fix test failures
  • os here, or in a separate PR?
    • Separate PR

@webmat webmat requested a review from a team as a code owner December 21, 2018 04:11
@ruflin ruflin mentioned this pull request Dec 21, 2018
@webmat webmat self-assigned this Dec 21, 2018
@webmat webmat added in progress Pull request is currently in progress. ecs labels Dec 21, 2018
@webmat
Copy link
Contributor Author

webmat commented Dec 21, 2018

@andrewkroh I'm having problems with make update in Packetbeat. Does this ring a bell? fields_yml is equal to ., instead of being the path to the fields.yml file. Looked at the makefile, and everything looks good there, unless PWD starts with a . and a space. Doesn't seem likely.

Anyway, here's the result of one of my runs:

mage update
Generated fields.yml for packetbeat to /Users/mat/go/src/github.com/elastic/beats/packetbeat/fields.yml
Generated fields.yml for packetbeat to /Users/mat/go/src/github.com/elastic/beats/packetbeat/fields.yml
>> The index pattern was created under /Users/mat/go/src/github.com/elastic/beats/packetbeat/build/kibana/6/index-pattern/packetbeat.json
>> Building packetbeat.yml for linux/amd64
>> Building packetbeat.reference.yml for linux/amd64
>> Building packetbeat.docker.yml for linux/amd64
Traceback (most recent call last):
  File "/Users/mat/go/src/github.com/elastic/beats/libbeat/scripts/generate_fields_docs.py", line 169, in <module>
    with open(fields_yml) as f:
IOError: [Errno 21] Is a directory: '.'
Error: running "/Users/mat/go/src/github.com/elastic/beats/build/ve/darwin/bin/python /Users/mat/go/src/github.com/elastic/beats/libbeat/scripts/generate_fields_docs.py . packetbeat /Users/mat/go/src/github.com/elastic/beats --output_path /Users/mat/go/src/github.com/elastic/beats/packetbeat" failed with exit code 1
make: *** [update] Error 1

@ruflin
Copy link
Member

ruflin commented Dec 21, 2018

@webmat Try running make clean and then make update

@webmat
Copy link
Contributor Author

webmat commented Dec 21, 2018

@ruflin Ah, that did it. Thanks!

@webmat webmat force-pushed the ecs-beta2-update branch 3 times, most recently from 103faed to 619c5a0 Compare December 21, 2018 16:44
Mathieu Martin added 2 commits December 21, 2018 11:51
- With the exception of http, captured in elastic#9645
- With the exception of os, which must be updated in a bunch of places
@webmat webmat added review and removed in progress Pull request is currently in progress. labels Dec 21, 2018
@webmat webmat changed the title WIP Finish importing ECS Beta 2 differences Finish importing ECS Beta 2 differences Dec 21, 2018
@webmat webmat merged commit b168683 into elastic:master Dec 21, 2018
DStape pushed a commit to DStape/beats that referenced this pull request Aug 20, 2019
This addresses most of the differences, with the exception of http (elastic#9645) and os (PR coming)

Changes:

- `client/server`, `source/destination`
  - Update each field set's definition
  - Add the `.address` field (except for `source`, which already had it)
- `network`: update definitions and examples wrt lowercase directive
- `user_agent.original` index is now `keyword` indexed (See elastic/ecs#262)
- Update `ecs.version` example
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