From 93648a20597e1b7a25b8fde7018cb69f7ba40ba1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 10:22:35 +0100 Subject: [PATCH 1/2] build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062) * 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.0 to 8.19.1. - [Release notes](https://github.com/elastic/go-elasticsearch/releases) - [Changelog](https://github.com/elastic/go-elasticsearch/blob/v8.19.1/CHANGELOG.md) - [Commits](https://github.com/elastic/go-elasticsearch/compare/v8.19.0...v8.19.1) --- updated-dependencies: - dependency-name: github.com/elastic/go-elasticsearch/v8 dependency-version: 8.19.1 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] (cherry picked from commit afada3007d184b816d9af8a2c3c51e19384a98ce) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum --- NOTICE-fips.txt | 12 ++++++++++-- NOTICE.txt | 12 ++++++++++-- go.mod | 6 +++++- go.sum | 7 +++++++ 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index b38c9662b..5ae54e458 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -1083,11 +1083,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 +<<<<<<< HEAD Version: v8.18.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.18.1/LICENSE: +======= +Version: v8.19.1 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.1/LICENSE: +>>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) Apache License Version 2.0, January 2004 @@ -5208,11 +5216,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-transport-go/v8 -Version: v8.7.0 +Version: v8.8.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.7.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.8.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/NOTICE.txt b/NOTICE.txt index 7b5a4e93c..c0075ad4c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1083,11 +1083,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 +<<<<<<< HEAD Version: v8.18.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.18.1/LICENSE: +======= +Version: v8.19.1 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.1/LICENSE: +>>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) Apache License Version 2.0, January 2004 @@ -5208,11 +5216,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-transport-go/v8 -Version: v8.7.0 +Version: v8.8.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.7.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.8.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 2c96ae2a5..4757c0068 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,11 @@ require ( github.com/elastic/elastic-agent-client/v7 v7.17.2 github.com/elastic/elastic-agent-libs v0.28.0 github.com/elastic/elastic-agent-system-metrics v0.13.4 +<<<<<<< HEAD github.com/elastic/go-elasticsearch/v8 v8.18.1 +======= + github.com/elastic/go-elasticsearch/v8 v8.19.1 +>>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.8.0 github.com/go-chi/chi/v5 v5.2.3 @@ -53,7 +57,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect + github.com/elastic/elastic-transport-go/v8 v8.8.0 // indirect github.com/elastic/go-structform v0.0.12 // indirect github.com/elastic/go-sysinfo v1.15.1 // indirect github.com/elastic/go-windows v1.0.2 // indirect diff --git a/go.sum b/go.sum index 515d11e80..666008432 100644 --- a/go.sum +++ b/go.sum @@ -39,10 +39,17 @@ github.com/elastic/elastic-agent-libs v0.28.0 h1:UDL9aSxgjqC9TrHAEHgI8gtuhRYPM/1 github.com/elastic/elastic-agent-libs v0.28.0/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ= github.com/elastic/elastic-agent-system-metrics v0.13.4 h1:gX8VdlQyakPcPKFpD7uHv2QLRDyguuKfZgu0LE27V7c= github.com/elastic/elastic-agent-system-metrics v0.13.4/go.mod h1:lB8veYWYBlA9eF6TahmPN87G1IEgWlbep7QSqLSW90U= +<<<<<<< HEAD github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE= github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/go-elasticsearch/v8 v8.18.1 h1:lPsN2Wk6+QqBeD4ckmOax7G/Y8tAZgroDYG8j6/5Ce0= github.com/elastic/go-elasticsearch/v8 v8.18.1/go.mod h1:F3j9e+BubmKvzvLjNui/1++nJuJxbkhHefbaT0kFKGY= +======= +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.1 h1:0iEGt5/Ds9MNVxEp3hqLsXdbe6SjleaVHONg/FuR09Q= +github.com/elastic/go-elasticsearch/v8 v8.19.1/go.mod h1:tHJQdInFa6abmDbDCEH2LJja07l/SIpaGpJcm13nt7s= +>>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) 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 a1373ffe899cea3cabe18cde13c9ef1df877206c Mon Sep 17 00:00:00 2001 From: ebeahan Date: Tue, 16 Dec 2025 14:28:36 -0600 Subject: [PATCH 2/2] fix conflicts --- NOTICE-fips.txt | 8 -------- NOTICE.txt | 8 -------- go.mod | 4 ---- go.sum | 7 ------- 4 files changed, 27 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 5ae54e458..c75302a2c 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -1083,19 +1083,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -<<<<<<< HEAD -Version: v8.18.1 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.18.1/LICENSE: -======= Version: v8.19.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.1/LICENSE: ->>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) Apache License Version 2.0, January 2004 diff --git a/NOTICE.txt b/NOTICE.txt index c0075ad4c..b9e83f472 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1083,19 +1083,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -<<<<<<< HEAD -Version: v8.18.1 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.18.1/LICENSE: -======= Version: v8.19.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.1/LICENSE: ->>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 4757c0068..62e224470 100644 --- a/go.mod +++ b/go.mod @@ -10,11 +10,7 @@ require ( github.com/elastic/elastic-agent-client/v7 v7.17.2 github.com/elastic/elastic-agent-libs v0.28.0 github.com/elastic/elastic-agent-system-metrics v0.13.4 -<<<<<<< HEAD - github.com/elastic/go-elasticsearch/v8 v8.18.1 -======= github.com/elastic/go-elasticsearch/v8 v8.19.1 ->>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.8.0 github.com/go-chi/chi/v5 v5.2.3 diff --git a/go.sum b/go.sum index 666008432..4f2404386 100644 --- a/go.sum +++ b/go.sum @@ -39,17 +39,10 @@ github.com/elastic/elastic-agent-libs v0.28.0 h1:UDL9aSxgjqC9TrHAEHgI8gtuhRYPM/1 github.com/elastic/elastic-agent-libs v0.28.0/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ= github.com/elastic/elastic-agent-system-metrics v0.13.4 h1:gX8VdlQyakPcPKFpD7uHv2QLRDyguuKfZgu0LE27V7c= github.com/elastic/elastic-agent-system-metrics v0.13.4/go.mod h1:lB8veYWYBlA9eF6TahmPN87G1IEgWlbep7QSqLSW90U= -<<<<<<< HEAD -github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE= -github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= -github.com/elastic/go-elasticsearch/v8 v8.18.1 h1:lPsN2Wk6+QqBeD4ckmOax7G/Y8tAZgroDYG8j6/5Ce0= -github.com/elastic/go-elasticsearch/v8 v8.18.1/go.mod h1:F3j9e+BubmKvzvLjNui/1++nJuJxbkhHefbaT0kFKGY= -======= 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.1 h1:0iEGt5/Ds9MNVxEp3hqLsXdbe6SjleaVHONg/FuR09Q= github.com/elastic/go-elasticsearch/v8 v8.19.1/go.mod h1:tHJQdInFa6abmDbDCEH2LJja07l/SIpaGpJcm13nt7s= ->>>>>>> afada30 (build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.19.0 to 8.19.1 (#6062)) 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=