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

Cherry-pick #22521 to 7.x: Add basic wildcard/keyword fallback for upcoming ECS releases #22568

Merged
merged 1 commit into from
Nov 12, 2020

Conversation

andrewstucki
Copy link

@andrewstucki andrewstucki commented Nov 12, 2020

Cherry-pick of PR #22521 to 7.x branch. Original message:

What does this PR do?

This sets the groundwork for #21674 by adding a simple fallback mechanism for wildcard fields in unsupported Elasticsearch versions and non-OSS Beats distros. If you're publishing to ES < 7.9.0 you get keyword fields instead of wildcard, if you're coming from OSS Beats you get the same.

This will allow us to move forward with the migration to ECS 1.7.0 with upcoming wildcard support..

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.

…c#22521)

* Add basic wildcard/keyword fallback for upcoming ECS releases

* update changelog

* Invert global boolean

* Remove global

* Rename XPack to ElasticLicensed

(cherry picked from commit 0fda306)
@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 Nov 12, 2020
@elasticmachine
Copy link
Collaborator

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 16376
Skipped 1368
Total 17744

@elasticmachine
Copy link
Collaborator

💚 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 #22568 opened]

  • Start Time: 2020-11-12T14:12:14.940+0000

  • Duration: 64 min 55 sec

Test stats 🧪

Test Results
Failed 0
Passed 16376
Skipped 1368
Total 17744

Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

👍

@andrewstucki andrewstucki merged commit d9116c8 into elastic:7.x Nov 12, 2020
@andrewstucki andrewstucki deleted the backport_22521_7.x branch November 12, 2020 17:18
@zube zube bot removed the [zube]: Done label Feb 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants