Skip to content

[9.1](backport #5211) build(deps): bump github.com/elastic/elastic-agent-libs from 0.21.4 to 0.21.6#5533

Closed
mergify[bot] wants to merge 1 commit into9.1from
mergify/bp/9.1/pr-5211
Closed

[9.1](backport #5211) build(deps): bump github.com/elastic/elastic-agent-libs from 0.21.4 to 0.21.6#5533
mergify[bot] wants to merge 1 commit into9.1from
mergify/bp/9.1/pr-5211

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 17, 2025

Bumps github.com/elastic/elastic-agent-libs from 0.21.4 to 0.21.6.

Release notes

Sourced from github.com/elastic/elastic-agent-libs's releases.

v0.21.6

What's Changed

Full Changelog: elastic/elastic-agent-libs@v0.21.5...v0.21.6

v0.21.5

What's Changed

Full Changelog: elastic/elastic-agent-libs@v0.21.4...v0.21.5

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

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

…o 0.21.6 (#5211)

* build(deps): bump github.com/elastic/elastic-agent-libs

Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.21.4 to 0.21.6.
- [Release notes](https://github.com/elastic/elastic-agent-libs/releases)
- [Commits](elastic/elastic-agent-libs@v0.21.4...v0.21.6)

---
updated-dependencies:
- dependency-name: github.com/elastic/elastic-agent-libs
  dependency-version: 0.21.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Pass logger to tlscommon functions

* Refactoring logger package to avoid import cycle

* Post dependabot file modifications

* Remove name stutter

* Remove ECS naming stutter

* Don't share logger

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 13bea07)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/api/metrics.go
#	internal/pkg/api/server.go
#	internal/pkg/config/output.go
#	internal/pkg/dl/policies.go
#	magefile.go
@mergify mergify bot requested a review from a team as a code owner September 17, 2025 15:21
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 17, 2025
@mergify mergify bot requested review from blakerouse and straistaru September 17, 2025 15:21
@mergify
Copy link
Contributor Author

mergify bot commented Sep 17, 2025

Cherry-pick of 13bea07 has failed:

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

You are currently cherry-picking commit 13bea07.
  (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:   internal/pkg/action/dispatcher.go
	modified:   internal/pkg/api/error.go
	modified:   internal/pkg/api/handleAck.go
	modified:   internal/pkg/api/handleCheckin.go
	modified:   internal/pkg/bulk/engine.go
	deleted:    internal/pkg/logger/ecs.go
	new file:   internal/pkg/logger/ecs/ecs.go
	modified:   internal/pkg/logger/http.go
	modified:   internal/pkg/logger/http_test.go
	modified:   internal/pkg/logger/logger.go
	modified:   internal/pkg/logger/logger_test.go
	renamed:    internal/pkg/logger/zapStub.go -> internal/pkg/logger/zap/zapStub.go
	modified:   internal/pkg/policy/monitor.go
	modified:   internal/pkg/policy/policy_output.go
	modified:   internal/pkg/policy/self.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/api/metrics.go
	both modified:   internal/pkg/api/server.go
	both modified:   internal/pkg/config/output.go
	both modified:   internal/pkg/dl/policies.go
	both modified:   magefile.go

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

@prodsecmachine
Copy link

prodsecmachine commented Sep 17, 2025

⚠️ Snyk checks are incomplete.

⚠️ security/snyk check encountered an error. (View Details)

⚠️ license/snyk check encountered an error. (View Details)

@straistaru
Copy link

@blakerouse I think we should close this PR, as the elastic-agent-libs has already been updated several times in this branch and is currently at v0.24.0.
Last update 00617dc.

@ebeahan
Copy link
Member

ebeahan commented Sep 22, 2025

@dependabot close

@mergify
Copy link
Contributor Author

mergify bot commented Sep 23, 2025

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.1/pr-5211 upstream/mergify/bp/9.1/pr-5211
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-5211

@straistaru straistaru closed this Sep 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation backport conflicts There is a conflict in the backported pull request dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants