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

[8.0](backport #29094) Add beat field back to beat.stats #29100

Merged
merged 5 commits into from
Dec 14, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 23, 2021

This is an automatic backport of pull request #29094 done by Mergify.
Cherry-pick of 24f4410 has failed:

On branch mergify/bp/8.0/pr-29094
Your branch is up to date with 'origin/8.0'.

You are currently cherry-picking commit 24f4410b6.
  (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:   metricbeat/docs/fields.asciidoc
	modified:   metricbeat/module/beat/stats/_meta/fields.yml
	renamed:    metricbeat/tests/system/test_beat.py -> metricbeat/module/beat/test_beat.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/beat/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

(cherry picked from commit 24f4410)

# Conflicts:
#	metricbeat/module/beat/fields.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 23, 2021
@mergify mergify bot assigned sayden Nov 23, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 23, 2021
@botelastic
Copy link

botelastic bot commented Nov 23, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 23, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-14T14:49:43.438+0000

  • Duration: 87 min 24 sec

  • Commit: 746ebfd

Test stats 🧪

Test Results
Failed 0
Passed 9153
Skipped 2422
Total 11575

💚 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!)

@mergify
Copy link
Contributor Author

mergify bot commented Nov 29, 2021

This pull request has not been merged yet. Could you please review and merge it @sayden? 🙏

@sayden
Copy link
Contributor

sayden commented Nov 30, 2021

/test

@mergify
Copy link
Contributor Author

mergify bot commented Dec 6, 2021

This pull request has not been merged yet. Could you please review and merge it @sayden? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Dec 9, 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/8.0/pr-29094 upstream/mergify/bp/8.0/pr-29094
git merge upstream/8.0
git push upstream mergify/bp/8.0/pr-29094

@mergify
Copy link
Contributor Author

mergify bot commented Dec 13, 2021

This pull request has not been merged yet. Could you please review and merge it @sayden? 🙏

# Conflicts:
#	metricbeat/docs/fields.asciidoc
#	metricbeat/module/beat/fields.go
#	metricbeat/module/beat/stats/_meta/fields.yml
@sayden sayden merged commit c99e920 into 8.0 Dec 14, 2021
@mergify mergify bot deleted the mergify/bp/8.0/pr-29094 branch December 14, 2021 16:45
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants