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.17](backport #32964) [Metricbeat] Add support for multiple regions in GCP #33098

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 15, 2022

This is an automatic backport of pull request #32964 done by Mergify.
Cherry-pick of 3bcefab has failed:

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

You are currently cherry-picking commit 3bcefabb28.
  (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:   CHANGELOG-developer.next.asciidoc
	modified:   x-pack/metricbeat/module/gcp/constants.go
	modified:   x-pack/metricbeat/module/gcp/metadata.go
	modified:   x-pack/metricbeat/module/gcp/metrics/metadata_services.go
	modified:   x-pack/metricbeat/module/gcp/metrics/timeseries.go
	modified:   x-pack/metricbeat/module/gcp/timeseries_metadata_collector.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/metricbeat/module/gcp/metrics/compute/metadata.go
	both modified:   x-pack/metricbeat/module/gcp/metrics/metrics_requester.go
	both modified:   x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go
	both modified:   x-pack/metricbeat/module/gcp/metrics/metricset.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

* add regions config setting and pass it as argument

* add services region resource label constants

* add buildRegionsFilter and update getFilterForMetric logic

* add getFilterForMetric and buildRegionsFilter tests

* add changelog entry

* minor changes for golangci-lint

* add warn logs and remove redundant return

* add missing argument in warnf log

(cherry picked from commit 3bcefab)

# Conflicts:
#	x-pack/metricbeat/module/gcp/metrics/compute/metadata.go
#	x-pack/metricbeat/module/gcp/metrics/metrics_requester.go
#	x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go
#	x-pack/metricbeat/module/gcp/metrics/metricset.go
@mergify mergify bot requested a review from a team as a code owner September 15, 2022 08:36
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 15, 2022
@mergify mergify bot assigned gpop63 Sep 15, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 15, 2022
@elasticmachine
Copy link
Collaborator

💔 Build Failed

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: 2022-09-15T08:37:13.449+0000

  • Duration: 21 min 8 sec

Test stats 🧪

Test Results
Failed 0
Passed 3
Skipped 0
Total 3

Steps errors 13

Expand to view the steps failures

Show only the first 10 steps failures

x-pack/metricbeat-goIntegTest - mage goIntegTest
  • Took 2 min 41 sec . View more details here
  • Description: mage goIntegTest
x-pack/metricbeat-goIntegTest - mage goIntegTest
  • Took 0 min 21 sec . View more details here
  • Description: mage goIntegTest
x-pack/metricbeat-goIntegTest - mage goIntegTest
  • Took 0 min 21 sec . View more details here
  • Description: mage goIntegTest
x-pack/metricbeat-pythonIntegTest - mage pythonIntegTest
  • Took 2 min 5 sec . View more details here
  • Description: mage pythonIntegTest
x-pack/metricbeat-pythonIntegTest - mage pythonIntegTest
  • Took 1 min 42 sec . View more details here
  • Description: mage pythonIntegTest
x-pack/metricbeat-pythonIntegTest - mage pythonIntegTest
  • Took 1 min 38 sec . View more details here
  • Description: mage pythonIntegTest
x-pack/metricbeat-windows-windows-2019 - mage build unitTest
  • Took 0 min 15 sec . View more details here
  • Description: mage build unitTest
x-pack/metricbeat-windows-windows-2019 - mage build unitTest
  • Took 0 min 13 sec . View more details here
  • Description: mage build unitTest
x-pack/metricbeat-windows-windows-2019 - mage build unitTest
  • Took 0 min 17 sec . View more details here
  • Description: mage build unitTest
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'hudson.AbortException: script returned exit code 1'

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

@endorama
Copy link
Member

The code drifted too much for this to be backported easily and we don't backport features to latest major releases. Closing unmerged.

@endorama endorama closed this Sep 15, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-32964 branch September 15, 2022 16:06
@endorama endorama added the Team:Cloud-Monitoring Label for the Cloud Monitoring team label Dec 21, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 21, 2022
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:Cloud-Monitoring Label for the Cloud Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants