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 #35540) [AWS] Collect metrics from linked accounts #35585

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2023

This is an automatic backport of pull request #35540 done by Mergify.
Cherry-pick of 217e658 has failed:

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

You are currently cherry-picking commit 217e658c8b.
  (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:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   metricbeat/docs/modules/aws.asciidoc
	both modified:   x-pack/metricbeat/module/aws/_meta/docs.asciidoc
	both modified:   x-pack/metricbeat/module/aws/billing/billing.go
	both modified:   x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go
	both modified:   x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go
	both modified:   x-pack/metricbeat/module/aws/utils.go
	both modified:   x-pack/metricbeat/module/aws/utils_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

(cherry picked from commit 217e658)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	metricbeat/docs/modules/aws.asciidoc
#	x-pack/metricbeat/module/aws/_meta/docs.asciidoc
#	x-pack/metricbeat/module/aws/billing/billing.go
#	x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go
#	x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go
#	x-pack/metricbeat/module/aws/utils.go
#	x-pack/metricbeat/module/aws/utils_test.go
@mergify mergify bot requested review from a team as code owners May 26, 2023 08:07
@mergify mergify bot requested review from fearful-symmetry and leehinman and removed request for a team May 26, 2023 08:07
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 26, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 26, 2023
@botelastic
Copy link

botelastic bot commented May 26, 2023

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

@elasticmachine
Copy link
Collaborator

💔 Build Failed

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-26T08:07:23.249+0000

  • Duration: 9 min 38 sec

Steps errors 1

Expand to view the steps failures

Shell Script
  • Took 0 min 2 sec . View more details here
  • Description: HOME=/var/lib/jenkins/workspace/Beats_beats_PR-35585 GO_VERSION=1.19.9 ./dev-tools/run_with_go_ver make test-mage

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

@zmoog
Copy link
Contributor

zmoog commented May 26, 2023

Closing 7.17 backport for now.

@zmoog zmoog closed this May 26, 2023
@zmoog zmoog deleted the mergify/bp/7.17/pr-35540 branch May 26, 2023 11:40
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.

None yet

3 participants