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 #35302) [add_cloud_metadata processor] Update azure metadata api version #35364

Merged
merged 4 commits into from
May 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 6, 2023

This is an automatic backport of pull request #35302 done by Mergify.
Cherry-pick of 25e882f has failed:

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

You are currently cherry-picking commit 25e882fcd4.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/processors/add_cloud_metadata/provider_azure_vm.go
	both modified:   libbeat/processors/add_cloud_metadata/provider_azure_vm_test.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

)

* update azure metadata api version

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* fix linter

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)

# Conflicts:
#	libbeat/processors/add_cloud_metadata/provider_azure_vm.go
#	libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go
@mergify mergify bot requested a review from a team as a code owner May 6, 2023 17:51
@mergify mergify bot requested review from ycombinator and faec and removed request for a team May 6, 2023 17:51
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 6, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 6, 2023
@botelastic
Copy link

botelastic bot commented May 6, 2023

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 6, 2023

💚 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: 2023-05-09T09:51:14.244+0000

  • Duration: 92 min 5 sec

Test stats 🧪

Test Results
Failed 0
Passed 22278
Skipped 1572
Total 23850

💚 Flaky test report

Tests succeeded.

🤖 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 May 8, 2023

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

@tetianakravchenko tetianakravchenko removed the conflicts There is a conflict in the backported pull request label May 9, 2023
@tetianakravchenko tetianakravchenko merged commit f46eda5 into 7.17 May 9, 2023
@tetianakravchenko tetianakravchenko deleted the mergify/bp/7.17/pr-35302 branch May 9, 2023 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 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