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

[8.3](backport #32336) Update elastic-agent-system-metrics deps #32348

Merged
merged 2 commits into from
Jul 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 13, 2022

This is an automatic backport of pull request #32336 done by Mergify.
Cherry-pick of 2fceb55 has failed:

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

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

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 elastic-agent-system-metrics deps

* make notice, add changelog

(cherry picked from commit 2fceb55)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner July 13, 2022 15:48
@mergify mergify bot requested review from rdner and fearful-symmetry and removed request for a team July 13, 2022 15:48
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 13, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 13, 2022
@botelastic
Copy link

botelastic bot commented Jul 13, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 13, 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-07-14T18:01:55.065+0000

  • Duration: 110 min 9 sec

Test stats 🧪

Test Results
Failed 0
Passed 22330
Skipped 1932
Total 24262

💚 Flaky test report

Tests succeeded.

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

@rdner
Copy link
Member

rdner commented Jul 14, 2022

@fearful-symmetry seems like a failed conflict resolution.

@fearful-symmetry fearful-symmetry merged commit c72a847 into 8.3 Jul 14, 2022
@mergify mergify bot deleted the mergify/bp/8.3/pr-32336 branch July 14, 2022 22:02
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
elastic#32348)

* Update elastic-agent-system-metrics deps (elastic#32336)

* update elastic-agent-system-metrics deps

* make notice, add changelog

(cherry picked from commit 02dfdd4)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum

* merge fixes

Co-authored-by: Alex K <[email protected]>
Co-authored-by: Alex Kristiansen <[email protected]>
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.

3 participants