From f88fa26f057ff822ea39ae860bd3ee0d1a2e6168 Mon Sep 17 00:00:00 2001 From: Lee E Hinman <57081003+leehinman@users.noreply.github.com> Date: Tue, 24 Mar 2026 08:30:03 -0500 Subject: [PATCH 1/2] update gosigar to v0.14.4 (#49553) * update gosigar to v0.14.4 Co-authored-by: Mauri de Souza Meneguzzo (cherry picked from commit b49ecb8715459a53312e7da7423a40ebdca63ee2) # Conflicts: # go.mod # go.sum --- NOTICE.txt | 4 +- .../1773868374-update-gosigar-to-v0.14.4.yaml | 45 +++++++++++++++++++ go.mod | 5 +++ go.sum | 8 +++- 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 changelog/fragments/1773868374-update-gosigar-to-v0.14.4.yaml diff --git a/NOTICE.txt b/NOTICE.txt index 692df04e5c4d..526ab7b832b1 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -14381,11 +14381,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/gokrb5/v8@v8.0. -------------------------------------------------------------------------------- Dependency : github.com/elastic/gosigar -Version: v0.14.3 +Version: v0.14.4 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.14.3/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.14.4/LICENSE: Apache License Version 2.0, January 2004 diff --git a/changelog/fragments/1773868374-update-gosigar-to-v0.14.4.yaml b/changelog/fragments/1773868374-update-gosigar-to-v0.14.4.yaml new file mode 100644 index 000000000000..0b20e7c5b29c --- /dev/null +++ b/changelog/fragments/1773868374-update-gosigar-to-v0.14.4.yaml @@ -0,0 +1,45 @@ +# REQUIRED +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: bug-fix + +# REQUIRED for all kinds +# Change summary; a 80ish characters long description of the change. +summary: Fix unnecessary Windows filesystem metricset errors from non-existent volumes. + +# REQUIRED for breaking-change, deprecation, known-issue +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +description: Fixes an issue where filesystem metric collection on Windows could report errors for volumes that are no longer present. Updated to gosigar v0.14.4. + +# REQUIRED for breaking-change, deprecation, known-issue +# impact: + +# REQUIRED for breaking-change, deprecation, known-issue +# action: + +# REQUIRED for all kinds +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: metricbeat + +# AUTOMATED +# OPTIONAL to manually add other PR URLs +# PR URL: A link the PR that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +pr: https://github.com/elastic/beats/pull/49553 + +# AUTOMATED +# OPTIONAL to manually add other issue URLs +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +# issue: https://github.com/owner/repo/1234 diff --git a/go.mod b/go.mod index 06c4741d93d7..d52286b00965 100644 --- a/go.mod +++ b/go.mod @@ -69,8 +69,13 @@ require ( github.com/elastic/go-structform v0.0.12 github.com/elastic/go-sysinfo v1.15.3 github.com/elastic/go-ucfg v0.8.8 +<<<<<<< HEAD github.com/elastic/gosigar v0.14.3 github.com/fatih/color v1.16.0 +======= + github.com/elastic/gosigar v0.14.4 + github.com/fatih/color v1.16.0 // indirect +>>>>>>> b49ecb871 (update gosigar to v0.14.4 (#49553)) github.com/fearful-symmetry/gorapl v0.0.4 github.com/fsnotify/fsevents v0.1.1 github.com/fsnotify/fsnotify v1.9.0 diff --git a/go.sum b/go.sum index 5f488c6e5917..5609b4a7dd88 100644 --- a/go.sum +++ b/go.sum @@ -408,10 +408,17 @@ github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102 h1:HBjzmhV2CkYn0 github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102/go.mod h1:xoTq5saXNyokdlvOhMz+JQGU+RTzTtYzqo1Bc86q3Fs= github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6 h1:VgOx6omXIMKozR+R4HhQRT9q1Irm/h13DLtSkejoAJY= github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6/go.mod h1:riddUzxTSBpJXk3qBHtYr4qOhFhT6k/1c0E3qkQjQpA= +<<<<<<< HEAD github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo= github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/elastic/mito v1.23.1 h1:h4LXcaz935Hg4a1Lr+dl5mMJSqF/atvuaHK7wdwVuf4= github.com/elastic/mito v1.23.1/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s= +======= +github.com/elastic/gosigar v0.14.4 h1:7NRnWJDFjEKpOjnHhtzrPGZWr9EMrYFsLjF4q0Czosk= +github.com/elastic/gosigar v0.14.4/go.mod h1:tx91Eb3YgFk6y++h88fRAnxic3Si1ZDHooqnJU/hqo8= +github.com/elastic/mito v1.24.1 h1:sx7TlL1OSKvIAWouRgCeuSd66V40pYl5s5vfcTqjHUo= +github.com/elastic/mito v1.24.1/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s= +>>>>>>> b49ecb871 (update gosigar to v0.14.4 (#49553)) github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw= github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0= github.com/elastic/sarama v1.19.1-0.20260310070522-abae92ca1603 h1:QFDM5JuLch52FxjHizLP2tiuzfhulUdyOsUe/JuPhrQ= @@ -1341,7 +1348,6 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From 7e155b83c6cb41deefb64182648b9c1d660e8a58 Mon Sep 17 00:00:00 2001 From: "Lee E. Hinman" Date: Tue, 24 Mar 2026 09:39:23 -0500 Subject: [PATCH 2/2] fix merge conflicts --- go.mod | 7 +------ go.sum | 11 ++--------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index d52286b00965..694508f7bd7e 100644 --- a/go.mod +++ b/go.mod @@ -69,13 +69,8 @@ require ( github.com/elastic/go-structform v0.0.12 github.com/elastic/go-sysinfo v1.15.3 github.com/elastic/go-ucfg v0.8.8 -<<<<<<< HEAD - github.com/elastic/gosigar v0.14.3 - github.com/fatih/color v1.16.0 -======= github.com/elastic/gosigar v0.14.4 - github.com/fatih/color v1.16.0 // indirect ->>>>>>> b49ecb871 (update gosigar to v0.14.4 (#49553)) + github.com/fatih/color v1.16.0 github.com/fearful-symmetry/gorapl v0.0.4 github.com/fsnotify/fsevents v0.1.1 github.com/fsnotify/fsnotify v1.9.0 diff --git a/go.sum b/go.sum index 5609b4a7dd88..9741de386c78 100644 --- a/go.sum +++ b/go.sum @@ -408,17 +408,10 @@ github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102 h1:HBjzmhV2CkYn0 github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102/go.mod h1:xoTq5saXNyokdlvOhMz+JQGU+RTzTtYzqo1Bc86q3Fs= github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6 h1:VgOx6omXIMKozR+R4HhQRT9q1Irm/h13DLtSkejoAJY= github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6/go.mod h1:riddUzxTSBpJXk3qBHtYr4qOhFhT6k/1c0E3qkQjQpA= -<<<<<<< HEAD -github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo= -github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= -github.com/elastic/mito v1.23.1 h1:h4LXcaz935Hg4a1Lr+dl5mMJSqF/atvuaHK7wdwVuf4= -github.com/elastic/mito v1.23.1/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s= -======= github.com/elastic/gosigar v0.14.4 h1:7NRnWJDFjEKpOjnHhtzrPGZWr9EMrYFsLjF4q0Czosk= github.com/elastic/gosigar v0.14.4/go.mod h1:tx91Eb3YgFk6y++h88fRAnxic3Si1ZDHooqnJU/hqo8= -github.com/elastic/mito v1.24.1 h1:sx7TlL1OSKvIAWouRgCeuSd66V40pYl5s5vfcTqjHUo= -github.com/elastic/mito v1.24.1/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s= ->>>>>>> b49ecb871 (update gosigar to v0.14.4 (#49553)) +github.com/elastic/mito v1.23.1 h1:h4LXcaz935Hg4a1Lr+dl5mMJSqF/atvuaHK7wdwVuf4= +github.com/elastic/mito v1.23.1/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s= github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw= github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0= github.com/elastic/sarama v1.19.1-0.20260310070522-abae92ca1603 h1:QFDM5JuLch52FxjHizLP2tiuzfhulUdyOsUe/JuPhrQ=