From d16c186cd3acbc2e6c24433206690806fb009d36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Feb 2026 11:05:16 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.0 to 0.14.1 (#6355) * 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.14.0 to 0.14.1. - [Release notes](https://github.com/elastic/elastic-agent-system-metrics/releases) - [Commits](https://github.com/elastic/elastic-agent-system-metrics/compare/v0.14.0...v0.14.1) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-system-metrics dependency-version: 0.14.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 05930c30f2a9a51f1194436d762c7463e42251c4) # Conflicts: # go.mod # go.sum --- NOTICE-fips.txt | 4 ++-- NOTICE.txt | 4 ++-- go.mod | 5 +++++ go.sum | 7 +++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 157ea39542..232ca9f1dc 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -842,11 +842,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.14.0 +Version: v0.14.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.1/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/NOTICE.txt b/NOTICE.txt index 6c84038040..7cd590fe1a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -842,11 +842,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.14.0 +Version: v0.14.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.1/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 7de8d02b26..d8310dc2b5 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,13 @@ 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/elastic-agent-libs v0.32.2 + github.com/elastic/elastic-agent-system-metrics v0.14.1 +>>>>>>> 05930c3 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.0 to 0.14.1 (#6355)) github.com/elastic/go-elasticsearch/v8 v8.19.2 github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.8.0 diff --git a/go.sum b/go.sum index 037bb5546c..6cd0923068 100644 --- a/go.sum +++ b/go.sum @@ -33,10 +33,17 @@ 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.18.0 h1:zXdoErqECfvRjj1c+1Ko4VGuUnFtJfTiC9JJz4aQCHc= github.com/elastic/elastic-agent-client/v7 v7.18.0/go.mod h1:ChFjpIfSsQOnhWT3se5Euw/o8P4Vf77FxeObE/vUfSc= +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.32.1 h1:cYUOmgUpq/e4vKGAen3/z/Puy1yVR0osBKHZWoNmBEg= github.com/elastic/elastic-agent-libs v0.32.1/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ= github.com/elastic/elastic-agent-system-metrics v0.14.0 h1:oqkUg5FZOJsfTptTYQcYh/wEMouYhosUJbNwi4z6OGA= github.com/elastic/elastic-agent-system-metrics v0.14.0/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA= +======= +github.com/elastic/elastic-agent-libs v0.32.2 h1:2CaO4TAMcZDy0qNxh48Ui1oMc+xExKL+JkpcyOxF7XA= +github.com/elastic/elastic-agent-libs v0.32.2/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ= +github.com/elastic/elastic-agent-system-metrics v0.14.1 h1:XdV3KWbug/M1dkn8h9Yth9pfdyeFR2Z1iqaypX+ohBg= +github.com/elastic/elastic-agent-system-metrics v0.14.1/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA= +>>>>>>> 05930c3 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.0 to 0.14.1 (#6355)) 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= From 97ab37d9f35be1f51d8179685995a1907db5d305 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 13 Feb 2026 10:34:43 -0800 Subject: [PATCH 2/2] fix: resolve merge conflicts for elastic-agent-libs and elastic-agent-system-metrics bumps Co-Authored-By: Claude Opus 4.6 --- go.mod | 5 ----- go.sum | 7 ------- 2 files changed, 12 deletions(-) diff --git a/go.mod b/go.mod index d8310dc2b5..30d73d9bce 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,8 @@ 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/elastic-agent-libs v0.32.2 github.com/elastic/elastic-agent-system-metrics v0.14.1 ->>>>>>> 05930c3 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.0 to 0.14.1 (#6355)) github.com/elastic/go-elasticsearch/v8 v8.19.2 github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.8.0 diff --git a/go.sum b/go.sum index 6cd0923068..87bf30444b 100644 --- a/go.sum +++ b/go.sum @@ -33,17 +33,10 @@ 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.18.0 h1:zXdoErqECfvRjj1c+1Ko4VGuUnFtJfTiC9JJz4aQCHc= github.com/elastic/elastic-agent-client/v7 v7.18.0/go.mod h1:ChFjpIfSsQOnhWT3se5Euw/o8P4Vf77FxeObE/vUfSc= -<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.32.1 h1:cYUOmgUpq/e4vKGAen3/z/Puy1yVR0osBKHZWoNmBEg= github.com/elastic/elastic-agent-libs v0.32.1/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ= -github.com/elastic/elastic-agent-system-metrics v0.14.0 h1:oqkUg5FZOJsfTptTYQcYh/wEMouYhosUJbNwi4z6OGA= -github.com/elastic/elastic-agent-system-metrics v0.14.0/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA= -======= -github.com/elastic/elastic-agent-libs v0.32.2 h1:2CaO4TAMcZDy0qNxh48Ui1oMc+xExKL+JkpcyOxF7XA= -github.com/elastic/elastic-agent-libs v0.32.2/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ= github.com/elastic/elastic-agent-system-metrics v0.14.1 h1:XdV3KWbug/M1dkn8h9Yth9pfdyeFR2Z1iqaypX+ohBg= github.com/elastic/elastic-agent-system-metrics v0.14.1/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA= ->>>>>>> 05930c3 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.0 to 0.14.1 (#6355)) 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=