Skip to content

[7.17](backport #33006) [GCP] Update fields docs and fix inconsistencies after #27974#33079

Merged
endorama merged 2 commits into7.17from
mergify/bp/7.17/pr-33006
Sep 19, 2022
Merged

[7.17](backport #33006) [GCP] Update fields docs and fix inconsistencies after #27974#33079
endorama merged 2 commits into7.17from
mergify/bp/7.17/pr-33006

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2022

This is an automatic backport of pull request #33006 done by Mergify.
Cherry-pick of 923e11f has failed:

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

You are currently cherry-picking commit 923e11f24f.
  (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/compute/_meta/docs.asciidoc
	modified:   x-pack/metricbeat/module/gcp/gke/_meta/docs.asciidoc
	modified:   x-pack/metricbeat/module/gcp/loadbalancing/_meta/docs.asciidoc
	modified:   x-pack/metricbeat/module/gcp/pubsub/_meta/docs.asciidoc
	modified:   x-pack/metricbeat/module/gcp/storage/_meta/docs.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/metricbeat/module/gcp/dataproc/_meta/docs.asciidoc
	deleted by us:   x-pack/metricbeat/module/gcp/firestore/_meta/docs.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.com

Co-authored-by: DeDe Morton <dede.morton@elastic.co>
(cherry picked from commit 923e11f)

# Conflicts:
#	x-pack/metricbeat/module/gcp/dataproc/_meta/docs.asciidoc
#	x-pack/metricbeat/module/gcp/firestore/_meta/docs.asciidoc
@mergify mergify bot requested a review from a team as a code owner September 14, 2022 12:41
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 14, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 14, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 14, 2022

💚 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: 2022-09-19T10:53:45.982+0000

  • Duration: 8 min 10 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

@mergify
Copy link
Contributor Author

mergify bot commented Sep 19, 2022

This pull request has not been merged yet. Could you please review and merge it @endorama? 🙏

@endorama endorama added Team:Cloud-Monitoring Label for the Cloud Monitoring team and removed conflicts There is a conflict in the backported pull request labels Sep 19, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 19, 2022
@endorama endorama merged commit c7dcb4a into 7.17 Sep 19, 2022
@endorama endorama deleted the mergify/bp/7.17/pr-33006 branch September 19, 2022 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Cloud-Monitoring Label for the Cloud Monitoring team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants