beats
beats copied to clipboard
[7.17](backport #31970) [Azure Billing] Upgrade Usage Details API to version 2019-10-01
This is an automatic backport of pull request #31970 done by Mergify. Cherry-pick of 1f232dc343a08c7f8baabe76c8f45a42c0234056 has failed:
On branch mergify/bp/7.17/pr-31970
Your branch is up to date with 'origin/7.17'.
You are currently cherry-picking commit 1f232dc343.
(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: metricbeat/docs/fields.asciidoc
modified: x-pack/metricbeat/module/azure/_meta/fields.yml
modified: x-pack/metricbeat/module/azure/billing/_meta/fields.yml
new file: x-pack/metricbeat/module/azure/billing/billing_test.go
modified: x-pack/metricbeat/module/azure/billing/client_test.go
modified: x-pack/metricbeat/module/azure/billing/data_test.go
modified: x-pack/metricbeat/module/azure/fields.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: go.sum
both modified: x-pack/metricbeat/module/azure/billing/billing.go
both modified: x-pack/metricbeat/module/azure/billing/client.go
both modified: x-pack/metricbeat/module/azure/billing/data.go
both modified: x-pack/metricbeat/module/azure/billing/mock_service.go
both modified: x-pack/metricbeat/module/azure/billing/service.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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill 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
:green_heart: Build Succeeded
the below badges are clickable and redirect to their specific view in the CI or DOCS
![]()
![]()
![]()
![]()
![]()
Expand to view the summary
Build stats
-
Start Time: 2022-10-18T13:56:52.617+0000
-
Duration: 132 min 53 sec
:grey_exclamation: Flaky test report
No test was executed to be analysed.
:robot: 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. -
runelasticsearch-ci/docs: Re-trigger the docs validation. (use unformatted text in the comment!)
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
Backporting this change to 7.17 requires extra work due to recent changes in shared libraries. For example, the move from common.MapStr to mapstr.M has several ramifications in the codebase.
I'm closing this PR due to the unexpected cost of porting. We will reevaluate this position in the future if there is an appetite for this change in 7.17.x series.
Backporting to 7.17 is back in progress.
/test
/package
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
This pull request is now in conflicts. Could you fix it? 🙏 To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
git fetch upstream
git checkout -b mergify/bp/7.17/pr-31970 upstream/mergify/bp/7.17/pr-31970
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-31970
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
I believe elastic/e2e-testing#3048 will help to get this PR through.
/test
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
/test
/test
/test
/test
/test
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
/test
/test
This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏
/test