Skip to content

Updating ECS version to 1.6.0 #78

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

Merged
merged 2 commits into from
Sep 14, 2020

Conversation

jonathan-buttner
Copy link
Collaborator

@jonathan-buttner jonathan-buttner commented Sep 1, 2020

This PR pulls in ECS version 1.6.0.

Notable changes:

  • Short descriptions were added to fields that had a description longer than 120ish characters
  • custom_process.yml changed a bit since ECS core no longer defines process.parent fields, instead it duplicates the process fields onto itself as parent
  • Not longer using my fork for ECS, we're back to ECS master branch!

The only things that should have changed from this PR are the descriptions/short fields and some of the metadata from the process changes.

@jonathan-buttner jonathan-buttner marked this pull request as ready for review September 9, 2020 14:42
@@ -13,6 +13,7 @@
top_level: true
expected:
- Target
- { at: Target.process, as: parent }
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The way schema is reused changed in ECS 1.6: elastic/ecs#960
elastic/ecs#959

This is basically placing the combined process schema onto Target.process.parent

@@ -138,76 +139,15 @@
Leave unpopulated if the validity or trust of the certificate was unchecked.
example: ERROR_UNTRUSTED_ROOT

- name: parent
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Since the parent schema is no longer explicitly specified in the ECS core schema (instead it just duplicates the process fields and calls them process.parent), we will move these fields onto process instead so they can also be duplicated. The fields on process won't actually be used, they'll only be used for process.parent.

@@ -4,7 +4,7 @@
],
"mappings": {
"_meta": {
"version": "1.5.0"
"version": "1.6.0"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The actual mapping shouldn't really change. We're just bumping the version number of ECS and a couple type: object fields will be removed (marking it as object is optional because that's the default type).

@jonathan-buttner jonathan-buttner merged commit 1f14c48 into elastic:master Sep 14, 2020
@jonathan-buttner jonathan-buttner deleted the upgrade-ecs branch September 14, 2020 14:44
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.

2 participants