Skip to content

[7.14](backport #27286) [Metricbeat] gcp: use ServiceMetrixPrefix in field extractor too#27357

Merged
endorama merged 1 commit into7.14from
mergify/bp/7.14/pr-27286
Aug 13, 2021
Merged

[7.14](backport #27286) [Metricbeat] gcp: use ServiceMetrixPrefix in field extractor too#27357
endorama merged 1 commit into7.14from
mergify/bp/7.14/pr-27286

Conversation

@mergify
Copy link
Copy Markdown
Contributor

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

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

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

You are currently cherry-picking commit aa3a2b3ff.
  (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/metrics/response_parser.go
	modified:   x-pack/metricbeat/module/gcp/metrics/response_parser_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   x-pack/metricbeat/module/gcp/metrics/metricset.go
	deleted by us:   x-pack/metricbeat/module/gcp/metrics/metricset_test.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 Aug 13, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 13, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Aug 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-08-13T08:02:53.965+0000

  • Duration: 80 min 21 sec

  • Commit: be3a064

Test stats 🧪

Test Results
Failed 0
Passed 2112
Skipped 192
Total 2304

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 2112
Skipped 192
Total 2304

@endorama endorama added the Team:Integrations Label for the Integrations team label Aug 13, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Aug 13, 2021

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 13, 2021
@endorama endorama force-pushed the mergify/bp/7.14/pr-27286 branch from c420952 to be3a064 Compare August 13, 2021 08:02
@endorama endorama merged commit 1dd53cb into 7.14 Aug 13, 2021
@endorama endorama deleted the mergify/bp/7.14/pr-27286 branch August 13, 2021 11:34
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