Skip to content

[7.x](backport #28368) [Metricbeat] gcp.gke: uniform metric's fields#28433

Merged
endorama merged 1 commit into7.xfrom
mergify/bp/7.x/pr-28368
Oct 14, 2021
Merged

[7.x](backport #28368) [Metricbeat] gcp.gke: uniform metric's fields#28433
endorama merged 1 commit into7.xfrom
mergify/bp/7.x/pr-28368

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 14, 2021

This is an automatic backport of pull request #28368 done by Mergify.
Cherry-pick of 568fd05 has failed:

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

You are currently cherry-picking commit 568fd05e68.
  (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/_meta/fields.yml
	modified:   x-pack/metricbeat/module/gcp/gke/_meta/fields.yml
	new file:   x-pack/metricbeat/module/gcp/gke/gke_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
Contributor

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

  • Duration: 46 min 49 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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-28368 branch from 09437a8 to efea782 Compare October 14, 2021 10:50
@endorama
Copy link
Contributor

/test

@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
Contributor

Pinging @elastic/integrations (Team:Integrations)

@endorama endorama merged commit f441b50 into 7.x Oct 14, 2021
@endorama endorama deleted the mergify/bp/7.x/pr-28368 branch October 14, 2021 15: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 Team:Integrations Label for the Integrations team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants