Skip to content

[7.x](backport #28370) [Metricbeat] gcp.loadbalancing: uniform metric's fields#28405

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

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

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 13, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #28370 done by Mergify.
Cherry-pick of d85c826 has failed:

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

You are currently cherry-picking commit d85c826298.
  (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/loadbalancing/_meta/fields.yml
	modified:   x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go
	modified:   x-pack/metricbeat/module/gcp/loadbalancing/manifest.yml

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 13, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 13, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 13, 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-10-14T15:57:37.393+0000

  • Duration: 105 min 5 sec

  • Commit: c9740f1

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 added the Team:Integrations Label for the Integrations team label Oct 13, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 13, 2021

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 13, 2021
@mergify
Copy link
Copy Markdown
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-28370 upstream/mergify/bp/7.x/pr-28370
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-28370

@endorama endorama force-pushed the mergify/bp/7.x/pr-28370 branch from 962000c to 9d157ab Compare October 14, 2021 10:13
@endorama
Copy link
Copy Markdown
Contributor

endorama commented Oct 14, 2021

running again as win7 worker became unavailable

/test

@endorama
[Metricbeat] gcp.loadbalancing: uniform metric's fields (#28370)
c9740f1 
(cherry picked from commit d85c826)

# Conflicts:
#	metricbeat/docs/fields.asciidoc
#	x-pack/metricbeat/module/gcp/fields.go
@endorama endorama force-pushed the mergify/bp/7.x/pr-28370 branch from 9d157ab to c9740f1 Compare October 14, 2021 15:57
@endorama endorama merged commit 9ac3d75 into 7.x Oct 14, 2021
@endorama endorama deleted the mergify/bp/7.x/pr-28370 branch October 14, 2021 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@endorama endorama

Labels

backport conflicts There is a conflict in the backported pull request Team:Integrations Label for the Integrations team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @endorama