Skip to content

[7.x](backport #27974) [Metricbeat] gcp: respect Beats naming conventions#28510

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

[7.x](backport #27974) [Metricbeat] gcp: respect Beats naming conventions#28510
endorama merged 1 commit into7.xfrom
mergify/bp/7.x/pr-27974

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2021

This is an automatic backport of pull request #27974 done by Mergify.
Cherry-pick of 5375f0a has failed:

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

You are currently cherry-picking commit 5375f0ac9b.
  (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.next.asciidoc
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/1ae960c0-f9f8-11eb-bc38-79936db7c106.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/lens/0776dbf0-019f-11eb-b032-d59f894a5072.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/lens/403d81e0-01a0-11eb-b032-d59f894a5072.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/lens/79d80f10-01a0-11eb-b032-d59f894a5072.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/lens/bd399790-01a2-11eb-b032-d59f894a5072.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/lens/f3e92c10-019d-11eb-b032-d59f894a5072.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/02b3c620-8e52-11ea-9fa6-4d675d5290dc.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/0bd0a6e0-9156-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/239e2290-8e52-11ea-9fa6-4d675d5290dc.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/2f6b6740-909b-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/3f472ea0-5e47-11ea-a4f6-717338406083.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/434f69f0-909b-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/43f45ba0-5e4a-11ea-a4f6-717338406083.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/543dac40-909b-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/6f795e70-5e49-11ea-a4f6-717338406083.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/6f933ef0-9155-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/8d4ddf40-9155-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/91eb8d10-8e51-11ea-9fa6-4d675d5290dc.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/9d919d00-5e4d-11ea-a4f6-717338406083.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/afeb98a0-a6ac-11ea-950e-d57608e3aa51.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/be27b340-a6ac-11ea-950e-d57608e3aa51.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/d4cc5ec0-8e51-11ea-9fa6-4d675d5290dc.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/d63465e0-9154-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/da5bc460-63e1-11ea-b0ac-95d4ecb1fecd.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/dff87070-9155-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/e562eb50-909a-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/e9e44d90-8e51-11ea-9fa6-4d675d5290dc.json
	modified:   x-pack/metricbeat/module/gcp/_meta/kibana/7/visualization/eb891a20-9155-11ea-8180-7b0dacd9df87.json
	modified:   x-pack/metricbeat/module/gcp/compute/_meta/fields.yml
	modified:   x-pack/metricbeat/module/gcp/fields.go
	modified:   x-pack/metricbeat/module/gcp/gke/_meta/fields.yml
	modified:   x-pack/metricbeat/module/gcp/loadbalancing/_meta/fields.yml
	modified:   x-pack/metricbeat/module/gcp/metrics/response_parser.go
	modified:   x-pack/metricbeat/module/gcp/pubsub/_meta/fields.yml
	modified:   x-pack/metricbeat/module/gcp/storage/_meta/fields.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/docs/fields.asciidoc

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

elasticmachine commented Oct 18, 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-19T07:55:05.696+0000

  • Duration: 102 min 57 sec

  • Commit: 65989ea

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.

(cherry picked from commit 5375f0a)

# Conflicts:
#	metricbeat/docs/fields.asciidoc
@endorama endorama force-pushed the mergify/bp/7.x/pr-27974 branch from 4b7490f to 65989ea Compare October 19, 2021 07:54
@endorama endorama added the Team:Integrations Label for the Integrations team label Oct 19, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 19, 2021
@endorama endorama merged commit c17cd7f into 7.x Oct 19, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-27974 branch October 19, 2021 10:46
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