From 6797c633d97424092ff6aade2f35b000426546f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 18:10:09 -0700 Subject: [PATCH 1/3] build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066) * 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.14.0 to 0.15.0. - [Release notes](https://github.com/elastic/elastic-agent-libs/releases) - [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-libs dependency-type: direct:production update-type: version-update:semver-minor ... 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 bd5251c871d3a1590d6198b87183119b80d2f913) # Conflicts: # NOTICE.txt # go.mod # go.sum # testing/go.mod # testing/go.sum --- NOTICE.txt | 8 ++++++++ go.mod | 4 ++++ go.sum | 5 +++++ testing/go.mod | 4 ++++ testing/go.sum | 5 +++++ 5 files changed, 26 insertions(+) diff --git a/NOTICE.txt b/NOTICE.txt index 91613a4f3..164f5614f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -661,11 +661,19 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs +<<<<<<< HEAD Version: v0.12.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.12.1/LICENSE: +======= +Version: v0.15.0 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.15.0/LICENSE: +>>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 79b9c2adc..714e8c6a0 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,11 @@ require ( github.com/dgraph-io/ristretto v0.1.1 github.com/docker/go-units v0.5.0 github.com/elastic/elastic-agent-client/v7 v7.16.0 +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.12.1 +======= + github.com/elastic/elastic-agent-libs v0.15.0 +>>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/elastic/elastic-agent-system-metrics v0.11.3 github.com/elastic/go-elasticsearch/v8 v8.15.0 github.com/elastic/go-ucfg v0.8.8 diff --git a/go.sum b/go.sum index 6e8aff26f..cad9a2088 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,13 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0= github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.12.1 h1:5jkxMx15Bna8cq7/Sz/XUIVUXfNWiJ80iSk4ICQ7KJ0= github.com/elastic/elastic-agent-libs v0.12.1/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= +======= +github.com/elastic/elastic-agent-libs v0.15.0 h1:MGl6vFu5YAxFHA+wDhXbQl2OvSk/MRgezxBCD5kCwIg= +github.com/elastic/elastic-agent-libs v0.15.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= +>>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/elastic/elastic-agent-system-metrics v0.11.3 h1:LDzRwP8kxvsYEtMDgMSKZs1TgPcSEukit+/EAP5Y28A= github.com/elastic/elastic-agent-system-metrics v0.11.3/go.mod h1:saqLKe9fuyuAo6IADAnnuy1kaBI7VNlxfwMo8KzSRyQ= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= diff --git a/testing/go.mod b/testing/go.mod index 7002518cb..4fb4639e0 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -31,7 +31,11 @@ require ( github.com/distribution/reference v0.5.0 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.12.1 // indirect +======= + github.com/elastic/elastic-agent-libs v0.15.0 // indirect +>>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/testing/go.sum b/testing/go.sum index 2aef05e24..a154da80a 100644 --- a/testing/go.sum +++ b/testing/go.sum @@ -39,8 +39,13 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0= github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.12.1 h1:5jkxMx15Bna8cq7/Sz/XUIVUXfNWiJ80iSk4ICQ7KJ0= github.com/elastic/elastic-agent-libs v0.12.1/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= +======= +github.com/elastic/elastic-agent-libs v0.15.0 h1:MGl6vFu5YAxFHA+wDhXbQl2OvSk/MRgezxBCD5kCwIg= +github.com/elastic/elastic-agent-libs v0.15.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= +>>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/elastic/go-sysinfo v1.14.2 h1:DeIy+pVfdRsd08Nx2Xjh+dUS+jrEEI7LGc29U/BKVWo= github.com/elastic/go-sysinfo v1.14.2/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk= github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk= From 8ff4338132c696a5efe0f13fcd78a00956fa460e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 30 Oct 2024 18:15:07 -0700 Subject: [PATCH 2/3] Fix conflicts --- NOTICE.txt | 8 -------- go.mod | 4 ---- go.sum | 5 ----- 3 files changed, 17 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 164f5614f..042083c69 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -661,19 +661,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -<<<<<<< HEAD -Version: v0.12.1 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.12.1/LICENSE: -======= Version: v0.15.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.15.0/LICENSE: ->>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 714e8c6a0..5468266bf 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,7 @@ require ( github.com/dgraph-io/ristretto v0.1.1 github.com/docker/go-units v0.5.0 github.com/elastic/elastic-agent-client/v7 v7.16.0 -<<<<<<< HEAD - github.com/elastic/elastic-agent-libs v0.12.1 -======= github.com/elastic/elastic-agent-libs v0.15.0 ->>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/elastic/elastic-agent-system-metrics v0.11.3 github.com/elastic/go-elasticsearch/v8 v8.15.0 github.com/elastic/go-ucfg v0.8.8 diff --git a/go.sum b/go.sum index cad9a2088..77b6aac08 100644 --- a/go.sum +++ b/go.sum @@ -35,13 +35,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0= github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= -<<<<<<< HEAD -github.com/elastic/elastic-agent-libs v0.12.1 h1:5jkxMx15Bna8cq7/Sz/XUIVUXfNWiJ80iSk4ICQ7KJ0= -github.com/elastic/elastic-agent-libs v0.12.1/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= -======= github.com/elastic/elastic-agent-libs v0.15.0 h1:MGl6vFu5YAxFHA+wDhXbQl2OvSk/MRgezxBCD5kCwIg= github.com/elastic/elastic-agent-libs v0.15.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= ->>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/elastic/elastic-agent-system-metrics v0.11.3 h1:LDzRwP8kxvsYEtMDgMSKZs1TgPcSEukit+/EAP5Y28A= github.com/elastic/elastic-agent-system-metrics v0.11.3/go.mod h1:saqLKe9fuyuAo6IADAnnuy1kaBI7VNlxfwMo8KzSRyQ= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= From d8d4030dbbd64d5742a89c7f046637e3edd43e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Thu, 31 Oct 2024 12:34:27 +0100 Subject: [PATCH 3/3] Fix conflicts, take 2 --- testing/go.mod | 4 ---- testing/go.sum | 5 ----- 2 files changed, 9 deletions(-) diff --git a/testing/go.mod b/testing/go.mod index 4fb4639e0..ac6f5059b 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -31,11 +31,7 @@ require ( github.com/distribution/reference v0.5.0 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect -<<<<<<< HEAD - github.com/elastic/elastic-agent-libs v0.12.1 // indirect -======= github.com/elastic/elastic-agent-libs v0.15.0 // indirect ->>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/testing/go.sum b/testing/go.sum index a154da80a..020728da2 100644 --- a/testing/go.sum +++ b/testing/go.sum @@ -39,13 +39,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/elastic/elastic-agent-client/v7 v7.16.0 h1:yKGq2+CxAuW8Kh0EoNl202tqAyQKfBcPRawVKs2Jve0= github.com/elastic/elastic-agent-client/v7 v7.16.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= -<<<<<<< HEAD -github.com/elastic/elastic-agent-libs v0.12.1 h1:5jkxMx15Bna8cq7/Sz/XUIVUXfNWiJ80iSk4ICQ7KJ0= -github.com/elastic/elastic-agent-libs v0.12.1/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= -======= github.com/elastic/elastic-agent-libs v0.15.0 h1:MGl6vFu5YAxFHA+wDhXbQl2OvSk/MRgezxBCD5kCwIg= github.com/elastic/elastic-agent-libs v0.15.0/go.mod h1:5CR02awPrBr+tfmjBBK+JI+dMmHNQjpVY24J0wjbC7M= ->>>>>>> bd5251c (build(deps): bump github.com/elastic/elastic-agent-libs from 0.14.0 to 0.15.0 (#4066)) github.com/elastic/go-sysinfo v1.14.2 h1:DeIy+pVfdRsd08Nx2Xjh+dUS+jrEEI7LGc29U/BKVWo= github.com/elastic/go-sysinfo v1.14.2/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk= github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk=