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

Add nested field yml support in elasticsearch template rendering #23183

Merged
merged 4 commits into from
Dec 16, 2020
Merged

Add nested field yml support in elasticsearch template rendering #23183

merged 4 commits into from
Dec 16, 2020

Conversation

andrewstucki
Copy link

@andrewstucki andrewstucki commented Dec 16, 2020 •
edited
Loading

What does this PR do?

It looks like we don't handle subfields specified in nested fields properly. Here's the relevant Elasticsearch documentation:

https://www.elastic.co/guide/en/elasticsearch/reference/current/nested.html

Currently it doesn't look like we use any non-dynamically mapped nested fields in our fields.yml specifications, so I'm fine doing this for the 7.12 release rather than 7.11.

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.

Related Issues

CC: @dcode

@andrewstucki andrewstucki requested a review from a team December 16, 2020 19:15
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 16, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 16, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #23183 updated

  • Start Time: 2020-12-16T19:20:32.645+0000

  • Duration: 53 min 37 sec

Test stats 🧪

Test Results
Failed 0
Passed 17502
Skipped 1383
Total 18885

Steps errors 2

Expand to view the steps failures

Terraform Apply on x-pack/metricbeat/module/aws
  • Took 0 min 15 sec . View more details on here
Terraform Apply on x-pack/metricbeat/module/aws
  • Took 0 min 15 sec . View more details on here

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 17502
Skipped 1383
Total 18885

leehinman
leehinman approved these changes Dec 16, 2020
View reviewed changes
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewstucki andrewstucki merged commit ba7dbb6 into elastic:master Dec 16, 2020
@andrewstucki andrewstucki mentioned this pull request Dec 16, 2020
Merged
6 tasks
andrewstucki pushed a commit to andrewstucki/beats that referenced this pull request Dec 16, 2020
Add nested field yml support in elasticsearch template rendering (ela…
d579eba 
…stic#23183)

* Add nested field yml support in elasticsearch template rendering

* Handle empty properties

* Update changelog

(cherry picked from commit ba7dbb6)
@andrewstucki andrewstucki deleted the nested-support branch December 16, 2020 20:44
andrewstucki pushed a commit that referenced this pull request Dec 17, 2020
Cherry-pick #23183 to 7.x: Add nested field yml support in elasticsea…
e6d405c 
…rch template rendering (#23187)

* Add nested field yml support in elasticsearch template rendering (#23183)

* Add nested field yml support in elasticsearch template rendering

* Handle empty properties

* Update changelog

(cherry picked from commit ba7dbb6)

* Update

* Remove space
dcode added a commit to dcode/beats that referenced this pull request Dec 17, 2020
@dcode
Adjust fields.yml to implement nested types
959b6bd 
Since elastic#23183 was merged, `fields.yml` can now properly specify types for
nested object properties
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leehinman leehinman leehinman approved these changes

Assignees
No one assigned
Labels
bug libbeat v7.12.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

fields.yml doesn't generate correct properties for elasticsearch template for nested field types
3 participants
@andrewstucki @elasticmachine @leehinman