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.16](backport #41524) update elastic-agent-system-metrics #41623

Merged
merged 3 commits into from
Nov 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2024

Bump elastic-agent-system-metrics

This is to include elastic/elastic-agent-system-metrics#186, which is a bug fix for darwin based systems.


This is an automatic backport of pull request #41524 done by [Mergify](https://mergify.com).

* chore: go.mod

* Notice

* go.mod

* chore: fix CI failure

* lint

* bug

* go.mod

* notice

(cherry picked from commit c07fffe)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner November 12, 2024 20:40
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 12, 2024
Copy link
Contributor Author

mergify bot commented Nov 12, 2024

Cherry-pick of c07fffe has failed:

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

You are currently cherry-picking commit c07fffe74a.
  (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:   NOTICE.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 12, 2024
@VihasMakwana VihasMakwana added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team and removed needs_team Indicates that the issue/PR needs a Team:* label conflicts There is a conflict in the backported pull request labels Nov 13, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@VihasMakwana VihasMakwana merged commit 5c6ea75 into 8.16 Nov 14, 2024
141 checks passed
@VihasMakwana VihasMakwana deleted the mergify/bp/8.16/pr-41524 branch November 14, 2024 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants