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

Ensure that match_only_text and wildcard fields can be added to default_field list #29634

Merged
merged 3 commits into from
Dec 30, 2021
Merged

Ensure that match_only_text and wildcard fields can be added to default_field list #29634

merged 3 commits into from
Dec 30, 2021

Conversation

adriansr
Copy link
Contributor

@adriansr adriansr commented Dec 29, 2021 •
edited
Loading

What does this PR do?

Fixes the construction of the index template's default_field list so that fields of type match_only_text and wildcard can be added to it.

Why is it important?

Since support for match_only_text type was introduced in Beats, important fields where missing from the default_field index template setting. This affected the message field among others.

Note: this PR only completely fixes the issue for the 7.16 branch, as another (unrelated) feature in 8.0/master also broke default_field. See #29633.

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 29, 2021
@mergify
Copy link
Contributor

mergify bot commented Dec 29, 2021

This pull request does not have a backport label. Could you fix it @adriansr? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 29, 2021
@adriansr adriansr changed the title Fix Ensure that match_only_text fields can be added to default_field list Dec 29, 2021
@adriansr adriansr added backport-v7.16.0 Automated backport with mergify backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify labels Dec 29, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Dec 29, 2021
@adriansr adriansr added backport-skip Skip notification from the automated backport with mergify Team:Security-External Integrations labels Dec 29, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 29, 2021
@adriansr adriansr added bug and removed backport-skip Skip notification from the automated backport with mergify labels Dec 29, 2021
@adriansr adriansr marked this pull request as ready for review December 29, 2021 11:31
@elasticmachine
Copy link
Collaborator

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

@adriansr adriansr requested review from a team December 29, 2021 11:49
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 29, 2021 •
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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-29T14:45:27.428+0000

  • Duration: 106 min 52 sec

  • Commit: 49ef34c

Test stats 🧪

Test Results
Failed 0
Passed 48687
Skipped 4277
Total 52964

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

andrewkroh
andrewkroh approved these changes Dec 29, 2021
View reviewed changes
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.

After seeing this I wonder if wildcard should be in that case too?

@adriansr
Copy link
Contributor Author

After seeing this I wonder if wildcard should be in that case too?

Makes sense. Added

@adriansr adriansr changed the title Ensure that match_only_text fields can be added to default_field list Ensure that match_only_text and wildcard fields can be added to default_field list Dec 30, 2021
@adriansr adriansr merged commit 84924e9 into elastic:master Dec 30, 2021
mergify bot pushed a commit that referenced this pull request Dec 30, 2021
@adriansr
Ensure that match_only_text and wildcard fields can be added to defau…
f8bb35a 
…lt_field list (#29634)

Fixes the construction of the index template's default_field list so that fields of type match_only_text
and wildcard can be added to it.

(cherry picked from commit 84924e9)
@mergify mergify bot mentioned this pull request Dec 30, 2021
Merged
mergify bot pushed a commit that referenced this pull request Dec 30, 2021
@adriansr
Ensure that match_only_text and wildcard fields can be added to defau…
d49121c 
…lt_field list (#29634)

Fixes the construction of the index template's default_field list so that fields of type match_only_text
and wildcard can be added to it.

(cherry picked from commit 84924e9)
@mergify mergify bot mentioned this pull request Dec 30, 2021
Merged
mergify bot pushed a commit that referenced this pull request Dec 30, 2021
@adriansr
Ensure that match_only_text and wildcard fields can be added to defau…
be60185 
…lt_field list (#29634)

Fixes the construction of the index template's default_field list so that fields of type match_only_text
and wildcard can be added to it.

(cherry picked from commit 84924e9)
@mergify mergify bot mentioned this pull request Dec 30, 2021
Merged
@adriansr adriansr deleted the fix_29633_for_7x branch December 30, 2021 03:47
adriansr added a commit that referenced this pull request Dec 30, 2021
@mergify @adriansr
Ensure that match_only_text and wildcard fields can be added to defau…
f50593f 
…lt_field list (#29634) (#29640)

Fixes the construction of the index template's default_field list so that fields of type match_only_text
and wildcard can be added to it.

(cherry picked from commit 84924e9)

Co-authored-by: Adrian Serrano <adrisr83@gmail.com>
adriansr added a commit that referenced this pull request Dec 30, 2021
@mergify @adriansr
Ensure that match_only_text and wildcard fields can be added to defau…
a89d3f0 
…lt_field list (#29634) (#29641)

Fixes the construction of the index template's default_field list so that fields of type match_only_text
and wildcard can be added to it.

(cherry picked from commit 84924e9)

Co-authored-by: Adrian Serrano <adrisr83@gmail.com>
adriansr added a commit that referenced this pull request Dec 30, 2021
@mergify @adriansr
Ensure that match_only_text and wildcard fields can be added to defau…
831da10 
…lt_field list (#29634) (#29642)

Fixes the construction of the index template's default_field list so that fields of type match_only_text
and wildcard can be added to it.

(cherry picked from commit 84924e9)

Co-authored-by: Adrian Serrano <adrisr83@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees
No one assigned
Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify backport-v8.1.0 Automated backport with mergify bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adriansr @elasticmachine @andrewkroh