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

[7.x](backport #25743) Don't include full ES index template in errors #26318

Merged
merged 4 commits into from
Jun 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2021

This is an automatic backport of pull request #25743 done by Mergify.
Cherry-pick of 766e303 has failed:

On branch mergify/bp/7.x/pr-25743
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 766e30313.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   libbeat/tests/system/test_template.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/template/load.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* Don't include full ES index template in errors

Index templates in some beats can be very large (~1MB) and including the data in errors can use a lot of memory and also makes for very large log lines. If the error is recurring then this makes the effects worse. So this change removes the index template body from the error. Users that need to see the index template for debugging can use `<beatname> export template --es.version=1.2.3`.

Fixes #25540

* Update expected log messages in tests

(cherry picked from commit 766e303)

# Conflicts:
#	libbeat/template/load.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 15, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 15, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 15, 2021

💚 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 #26318 updated

  • Start Time: 2021-06-15T17:43:04.844+0000

  • Duration: 139 min 52 sec

  • Commit: a202427

Test stats 🧪

Test Results
Failed 0
Passed 47481
Skipped 5207
Total 52688

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 47481
Skipped 5207
Total 52688

@mergify
Copy link
Contributor Author

mergify bot commented Jun 15, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-25743 upstream/mergify/bp/7.x/pr-25743
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-25743

@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 24, 2021
@jsoriano
Copy link
Member

Hey @andrewkroh, I think this is ready to be merged 🙂

@andrewkroh andrewkroh merged commit 19bb27c into 7.x Jun 30, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-25743 branch June 30, 2021 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants