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.16](backport #28995) Revert usageDetails api version to 2019-01-01 #29011

Merged
merged 2 commits into from
Nov 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2021

This is an automatic backport of pull request #28995 done by Mergify.
Cherry-pick of 77346be has failed:

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

You are currently cherry-picking commit 77346beb8a.
  (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:   NOTICE.txt
	modified:   go.mod
	modified:   x-pack/metricbeat/module/azure/billing/billing.go
	modified:   x-pack/metricbeat/module/azure/billing/client.go
	modified:   x-pack/metricbeat/module/azure/billing/client_test.go
	modified:   x-pack/metricbeat/module/azure/billing/data.go
	modified:   x-pack/metricbeat/module/azure/billing/data_test.go
	modified:   x-pack/metricbeat/module/azure/billing/mock_service.go
	modified:   x-pack/metricbeat/module/azure/billing/service.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

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

* fix billing

* changelog

* fix test

* fix test

* fmt update

* fmt

(cherry picked from commit 77346be)

# Conflicts:
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 17, 2021
@mergify mergify bot assigned narph Nov 17, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 17, 2021
@botelastic
Copy link

botelastic bot commented Nov 17, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 17, 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

  • Duration: 214 min 17 sec

❕ Flaky test report

No test was executed to be analysed.

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

* fix billing

* changelog

* fix test

* fix test

* fmt update

* fmt
@narph narph merged commit b119cff into 7.16 Nov 17, 2021
@narph narph deleted the mergify/bp/7.16/pr-28995 branch November 17, 2021 13:42
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants