From f18e874a0fcc86ca4a185f3cadaebd5125df7c6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Feb 2026 19:46:47 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.2 to 8.19.3 (#6345) * build(deps): bump github.com/elastic/go-elasticsearch/v8 Bumps [github.com/elastic/go-elasticsearch/v8](https://github.com/elastic/go-elasticsearch) from 8.19.2 to 8.19.3. - [Release notes](https://github.com/elastic/go-elasticsearch/releases) - [Changelog](https://github.com/elastic/go-elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/go-elasticsearch/compare/v8.19.2...v8.19.3) --- updated-dependencies: - dependency-name: github.com/elastic/go-elasticsearch/v8 dependency-version: 8.19.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> (cherry picked from commit 902c02548e015c7e6b51737d0bacf6ccb50c4734) # Conflicts: # go.mod --- NOTICE-fips.txt | 4 ++-- NOTICE.txt | 4 ++-- go.mod | 6 ++++++ go.sum | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 317b3284a2..b93b423eff 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -1083,11 +1083,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.19.2 +Version: v8.19.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.2/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.3/LICENSE: Apache License Version 2.0, January 2004 diff --git a/NOTICE.txt b/NOTICE.txt index 19021d2283..2b2d1cf162 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1083,11 +1083,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.19.2 +Version: v8.19.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.2/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.3/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index e228623fd0..0905cfa59e 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,15 @@ require ( github.com/dgraph-io/ristretto v0.2.0 github.com/docker/go-units v0.5.0 github.com/elastic/elastic-agent-client/v7 v7.18.0 +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.32.1 github.com/elastic/elastic-agent-system-metrics v0.14.0 github.com/elastic/go-elasticsearch/v8 v8.19.2 +======= + github.com/elastic/elastic-agent-libs v0.32.2 + github.com/elastic/elastic-agent-system-metrics v0.14.1 + github.com/elastic/go-elasticsearch/v8 v8.19.3 +>>>>>>> 902c025 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.2 to 8.19.3 (#6345)) github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.9.0 github.com/go-chi/chi/v5 v5.2.5 diff --git a/go.sum b/go.sum index 581522a394..db0b4033fa 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,8 @@ github.com/elastic/elastic-agent-system-metrics v0.14.0 h1:oqkUg5FZOJsfTptTYQcYh github.com/elastic/elastic-agent-system-metrics v0.14.0/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA= github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo= github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= -github.com/elastic/go-elasticsearch/v8 v8.19.2 h1:13Q0b7lW39H85Kb5SOpIzSyPbuZdAEPLd6kzsUHkpKQ= -github.com/elastic/go-elasticsearch/v8 v8.19.2/go.mod h1:tHJQdInFa6abmDbDCEH2LJja07l/SIpaGpJcm13nt7s= +github.com/elastic/go-elasticsearch/v8 v8.19.3 h1:5LDg0hfGJXBa9Y+2QlUgRTsNJ/7rm7oNidydtFAq0LI= +github.com/elastic/go-elasticsearch/v8 v8.19.3/go.mod h1:tHJQdInFa6abmDbDCEH2LJja07l/SIpaGpJcm13nt7s= github.com/elastic/go-structform v0.0.12 h1:HXpzlAKyej8T7LobqKDThUw7BMhwV6Db24VwxNtgxCs= github.com/elastic/go-structform v0.0.12/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.15.1 h1:zBmTnFEXxIQ3iwcQuk7MzaUotmKRp3OabbbWM8TdzIQ= From 88f5fd79e7be37e7d8c48b851c66abb3f560f9b2 Mon Sep 17 00:00:00 2001 From: ebeahan Date: Fri, 13 Feb 2026 13:54:39 -0600 Subject: [PATCH 2/2] fix conflicts --- go.mod | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.mod b/go.mod index 0905cfa59e..d8f6cf3a39 100644 --- a/go.mod +++ b/go.mod @@ -8,15 +8,9 @@ require ( github.com/dgraph-io/ristretto v0.2.0 github.com/docker/go-units v0.5.0 github.com/elastic/elastic-agent-client/v7 v7.18.0 -<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.32.1 github.com/elastic/elastic-agent-system-metrics v0.14.0 - github.com/elastic/go-elasticsearch/v8 v8.19.2 -======= - github.com/elastic/elastic-agent-libs v0.32.2 - github.com/elastic/elastic-agent-system-metrics v0.14.1 github.com/elastic/go-elasticsearch/v8 v8.19.3 ->>>>>>> 902c025 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.2 to 8.19.3 (#6345)) github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.9.0 github.com/go-chi/chi/v5 v5.2.5