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 #28372) [Metricbeat] gcp.storage: uniform metricset's fields #28439

Merged
merged 1 commit into from
Oct 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 14, 2021

This is an automatic backport of pull request #28372 done by Mergify.
Cherry-pick of 4229ede has failed:

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

You are currently cherry-picking commit 4229edeac4.
  (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:   x-pack/metricbeat/module/gcp/storage/_meta/fields.yml
	modified:   x-pack/metricbeat/module/gcp/storage/storage_integration_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/docs/fields.asciidoc
	both modified:   x-pack/metricbeat/module/gcp/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.io/

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 14, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 14, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 14, 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-10-14T17:49:09.500+0000

  • Duration: 94 min 46 sec

  • Commit: d6f4bf7

Test stats 🧪

Test Results
Failed 0
Passed 9656
Skipped 2447
Total 12103

💚 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.

@endorama endorama force-pushed the mergify/bp/7.x/pr-28372 branch from f1441a8 to 15d2838 Compare October 14, 2021 15:48
@mergify
Copy link
Contributor Author

mergify bot commented Oct 14, 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-28372 upstream/mergify/bp/7.x/pr-28372
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-28372

@endorama endorama added Team:Integrations Label for the Integrations team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 14, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

* gcp.storage: add TestFetch

* gcp.storage: flatten fields

* gcp: update fields

* metricbeat: mage update

(cherry picked from commit 4229ede)
@endorama endorama force-pushed the mergify/bp/7.x/pr-28372 branch 2 times, most recently from fb3fe71 to d6f4bf7 Compare October 14, 2021 17:48
@endorama endorama merged commit 982bd48 into 7.x Oct 15, 2021
@endorama endorama deleted the mergify/bp/7.x/pr-28372 branch October 15, 2021 08:04
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 Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants