From 853f94cd145ba90cc83ab13b904a0f7fc67a485f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 10:14:09 -0700 Subject: [PATCH 1/2] build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.9 to 0.11.10 (#7531) * build(deps): bump github.com/elastic/elastic-agent-system-metrics Bumps [github.com/elastic/elastic-agent-system-metrics](https://github.com/elastic/elastic-agent-system-metrics) from 0.11.9 to 0.11.10. - [Release notes](https://github.com/elastic/elastic-agent-system-metrics/releases) - [Commits](https://github.com/elastic/elastic-agent-system-metrics/compare/v0.11.9...v0.11.10) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-system-metrics dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- 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 1945efe19c3b7a3717c5c99d59acac570ff9d647) # Conflicts: # go.mod # go.sum --- NOTICE.txt | 4 ++-- go.mod | 5 +++++ go.sum | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 6fb190cceb7..b77f9770302 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1530,11 +1530,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.11.9 +Version: v0.11.10 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.9/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.10/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index f96a0ad7e4e..755cc358389 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,13 @@ require ( github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250310095219-198197d022ad github.com/elastic/elastic-agent-autodiscover v0.9.0 github.com/elastic/elastic-agent-client/v7 v7.17.1 +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.18.9 github.com/elastic/elastic-agent-system-metrics v0.11.9 +======= + github.com/elastic/elastic-agent-libs v0.18.10 + github.com/elastic/elastic-agent-system-metrics v0.11.10 +>>>>>>> 1945efe19 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.9 to 0.11.10 (#7531)) github.com/elastic/elastic-transport-go/v8 v8.6.1 github.com/elastic/go-elasticsearch/v8 v8.17.1 github.com/elastic/go-licenser v0.4.2 diff --git a/go.sum b/go.sum index 0340163cc9e..200b525d092 100644 --- a/go.sum +++ b/go.sum @@ -475,10 +475,17 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0 github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4= github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0= github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM= +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.18.9 h1:NQbBK6uMd/t4S0Fe7iOpT5mE7RXMWVaOLBSEXHRBzWI= github.com/elastic/elastic-agent-libs v0.18.9/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM= github.com/elastic/elastic-agent-system-metrics v0.11.9 h1:UDgT4ygXKGRwyNyUDzBKbDW7bYphZNg1GOLtDFqZ4Wg= github.com/elastic/elastic-agent-system-metrics v0.11.9/go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag= +======= +github.com/elastic/elastic-agent-libs v0.18.10 h1:ZmO8ihcWhULEyUA+9WyQR5W1+wxkTPOGiwLlqPy7s7I= +github.com/elastic/elastic-agent-libs v0.18.10/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM= +github.com/elastic/elastic-agent-system-metrics v0.11.10 h1:51u6roLaI0WhX1wbU4hPaervODegOxNFLcLouDAAi8A= +github.com/elastic/elastic-agent-system-metrics v0.11.10/go.mod h1:BlS6Fm/l/umAa9xKy7GxsSYtCfu/iqg551PULKSeCQM= +>>>>>>> 1945efe19 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.9 to 0.11.10 (#7531)) github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4= github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 h1:UyNbxdkQiSfyipwsOCWAlO+ju3xXC61Z4prx/HBTtFk= From bbd47bde25cf531e74921bd9b72599daf4717216 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 25 Mar 2025 16:20:33 -0700 Subject: [PATCH 2/2] Resolving conflicts --- go.mod | 5 ----- go.sum | 7 ------- 2 files changed, 12 deletions(-) diff --git a/go.mod b/go.mod index 755cc358389..42879590963 100644 --- a/go.mod +++ b/go.mod @@ -16,13 +16,8 @@ require ( github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250310095219-198197d022ad github.com/elastic/elastic-agent-autodiscover v0.9.0 github.com/elastic/elastic-agent-client/v7 v7.17.1 -<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.18.9 - github.com/elastic/elastic-agent-system-metrics v0.11.9 -======= - github.com/elastic/elastic-agent-libs v0.18.10 github.com/elastic/elastic-agent-system-metrics v0.11.10 ->>>>>>> 1945efe19 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.9 to 0.11.10 (#7531)) github.com/elastic/elastic-transport-go/v8 v8.6.1 github.com/elastic/go-elasticsearch/v8 v8.17.1 github.com/elastic/go-licenser v0.4.2 diff --git a/go.sum b/go.sum index 200b525d092..b42a6b1974e 100644 --- a/go.sum +++ b/go.sum @@ -475,17 +475,10 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0 github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4= github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0= github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM= -<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.18.9 h1:NQbBK6uMd/t4S0Fe7iOpT5mE7RXMWVaOLBSEXHRBzWI= github.com/elastic/elastic-agent-libs v0.18.9/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM= -github.com/elastic/elastic-agent-system-metrics v0.11.9 h1:UDgT4ygXKGRwyNyUDzBKbDW7bYphZNg1GOLtDFqZ4Wg= -github.com/elastic/elastic-agent-system-metrics v0.11.9/go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag= -======= -github.com/elastic/elastic-agent-libs v0.18.10 h1:ZmO8ihcWhULEyUA+9WyQR5W1+wxkTPOGiwLlqPy7s7I= -github.com/elastic/elastic-agent-libs v0.18.10/go.mod h1:Repx7BMzE1v/gTipPogNIQeEnSGwOWGBC63h7h9c5aM= github.com/elastic/elastic-agent-system-metrics v0.11.10 h1:51u6roLaI0WhX1wbU4hPaervODegOxNFLcLouDAAi8A= github.com/elastic/elastic-agent-system-metrics v0.11.10/go.mod h1:BlS6Fm/l/umAa9xKy7GxsSYtCfu/iqg551PULKSeCQM= ->>>>>>> 1945efe19 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.9 to 0.11.10 (#7531)) github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4= github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 h1:UyNbxdkQiSfyipwsOCWAlO+ju3xXC61Z4prx/HBTtFk=