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.15](backport #41186) fix: restore stderr logs when running on docker or systemd environments #41193

Merged
merged 2 commits into from
Oct 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2024

Proposed commit message

This PR updates elastic-agent-libs to the latest version in order to fix #41118.

Author's Checklist

  • Review the changes in elastic-agent-libs between v0.11.0...v0.12.1 and make sure there is no breaking changes added.

How to test this PR locally

cd filebeat
mage build
timeout 3 filebeat --environment docker

# filebeat json logs appear in the stderr

Related issues


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

This PR updates elastic-agent-libs to the latest version in order to fix #41118.

(cherry picked from commit f369a28)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner October 10, 2024 14:12
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 10, 2024
Copy link
Contributor Author

mergify bot commented Oct 10, 2024

Cherry-pick of f369a28 has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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 Oct 10, 2024
@mauri870 mauri870 added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 10, 2024
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 10, 2024
Copy link
Member

@mauri870 mauri870 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to fix conflicts.

@mauri870
Copy link
Member

FYI since this is a backport to 8.15 this PR bumps elastic-agent-libs from v0.9.3 to v0.12.1, here is the diff for context elastic/elastic-agent-libs@v0.9.3...v0.12.1.

@mauri870 mauri870 merged commit f32a872 into 8.15 Oct 11, 2024
139 checks passed
@mauri870 mauri870 deleted the mergify/bp/8.15/pr-41186 branch October 11, 2024 11:06
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 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.

2 participants