diff --git a/NOTICE.txt b/NOTICE.txt index 957101b6aacf..e72d81531f2a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -16889,6 +16889,37 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice defined by the Mozilla Public License, v. 2.0. +-------------------------------------------------------------------------------- +Dependency : github.com/go-viper/mapstructure/v2 +Version: v2.3.0 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/go-viper/mapstructure/v2@v2.3.0/LICENSE: + +The MIT License (MIT) + +Copyright (c) 2013 Mitchell Hashimoto + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + -------------------------------------------------------------------------------- Dependency : github.com/gocarina/gocsv Version: v0.0.0-20170324095351-ffef3ffc77be @@ -17396,6 +17427,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-------------------------------------------------------------------------------- +Dependency : github.com/gohugoio/hashstructure +Version: v0.5.0 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/gohugoio/hashstructure@v0.5.0/LICENSE: + +The MIT License (MIT) + +Copyright (c) 2016 Mitchell Hashimoto + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + -------------------------------------------------------------------------------- Dependency : github.com/golang-jwt/jwt/v5 Version: v5.2.2 @@ -21295,68 +21357,6 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice --------------------------------------------------------------------------------- -Dependency : github.com/mitchellh/hashstructure -Version: v1.1.0 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/mitchellh/hashstructure@v1.1.0/LICENSE: - -The MIT License (MIT) - -Copyright (c) 2016 Mitchell Hashimoto - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - --------------------------------------------------------------------------------- -Dependency : github.com/mitchellh/mapstructure -Version: v1.5.0 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/mitchellh/mapstructure@v1.5.0/LICENSE: - -The MIT License (MIT) - -Copyright (c) 2013 Mitchell Hashimoto - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - -------------------------------------------------------------------------------- Dependency : github.com/olekukonko/tablewriter Version: v0.0.5 @@ -46795,37 +46795,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -Dependency : github.com/go-viper/mapstructure/v2 -Version: v2.3.0 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/go-viper/mapstructure/v2@v2.3.0/LICENSE: - -The MIT License (MIT) - -Copyright (c) 2013 Mitchell Hashimoto - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - -------------------------------------------------------------------------------- Dependency : github.com/gobwas/glob Version: v0.2.3 @@ -55703,6 +55672,37 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-------------------------------------------------------------------------------- +Dependency : github.com/mitchellh/mapstructure +Version: v1.5.0 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/mitchellh/mapstructure@v1.5.0/LICENSE: + +The MIT License (MIT) + +Copyright (c) 2013 Mitchell Hashimoto + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + -------------------------------------------------------------------------------- Dependency : github.com/mitchellh/reflectwalk Version: v1.0.2 diff --git a/dev-tools/mage/pkgtypes.go b/dev-tools/mage/pkgtypes.go index 1899b5b4b9dc..2c5bb2442393 100644 --- a/dev-tools/mage/pkgtypes.go +++ b/dev-tools/mage/pkgtypes.go @@ -34,9 +34,9 @@ import ( "strconv" "strings" + "github.com/gohugoio/hashstructure" "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - "github.com/mitchellh/hashstructure" ) const ( diff --git a/filebeat/beater/crawler.go b/filebeat/beater/crawler.go index 525ab544141f..1fd2ee2db452 100644 --- a/filebeat/beater/crawler.go +++ b/filebeat/beater/crawler.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/beats/v7/filebeat/input" "github.com/elastic/beats/v7/libbeat/beat" diff --git a/filebeat/fileset/factory.go b/filebeat/fileset/factory.go index 690f5821c9ed..8e8e6e21633f 100644 --- a/filebeat/fileset/factory.go +++ b/filebeat/fileset/factory.go @@ -22,7 +22,7 @@ import ( "sync" "github.com/gofrs/uuid/v5" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/cfgfile" diff --git a/filebeat/input/file/identifier.go b/filebeat/input/file/identifier.go index e976384194e5..0c9b2dd277c8 100644 --- a/filebeat/input/file/identifier.go +++ b/filebeat/input/file/identifier.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/filebeat/input/v2/compat/compat.go b/filebeat/input/v2/compat/compat.go index 7a73def43ed3..1139436671ac 100644 --- a/filebeat/input/v2/compat/compat.go +++ b/filebeat/input/v2/compat/compat.go @@ -27,7 +27,7 @@ import ( "sync" "github.com/gofrs/uuid/v5" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" v2 "github.com/elastic/beats/v7/filebeat/input/v2" "github.com/elastic/beats/v7/libbeat/beat" diff --git a/go.mod b/go.mod index f75fcea10ddb..9437601c5b21 100644 --- a/go.mod +++ b/go.mod @@ -76,11 +76,13 @@ require ( github.com/fsnotify/fsnotify v1.9.0 github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect github.com/go-sql-driver/mysql v1.6.0 + github.com/go-viper/mapstructure/v2 v2.3.0 github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be github.com/godbus/dbus/v5 v5.1.0 github.com/godror/godror v0.33.2 github.com/gofrs/flock v0.8.1 github.com/gogo/protobuf v1.3.2 + github.com/gohugoio/hashstructure v0.5.0 github.com/golang/snappy v1.0.0 github.com/gomodule/redigo v1.8.3 github.com/google/flatbuffers v25.2.10+incompatible @@ -101,8 +103,6 @@ require ( github.com/mattn/go-colorable v0.1.13 github.com/miekg/dns v1.1.65 github.com/mitchellh/gox v1.0.1 - github.com/mitchellh/hashstructure v1.1.0 - github.com/mitchellh/mapstructure v1.5.0 github.com/olekukonko/tablewriter v0.0.5 github.com/osquery/osquery-go v0.0.0-20231108163517-e3cde127e724 github.com/pkg/errors v0.9.1 @@ -318,7 +318,6 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect - github.com/go-viper/mapstructure/v2 v2.3.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/goccy/go-json v0.10.3 // indirect github.com/godror/knownpb v0.1.0 // indirect @@ -372,6 +371,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/iochan v1.0.0 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/spdystream v0.5.0 // indirect diff --git a/go.sum b/go.sum index a21147f60446..e99cde352eb2 100644 --- a/go.sum +++ b/go.sum @@ -526,6 +526,8 @@ github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gohugoio/hashstructure v0.5.0 h1:G2fjSBU36RdwEJBWJ+919ERvOVqAg9tfcYp47K9swqg= +github.com/gohugoio/hashstructure v0.5.0/go.mod h1:Ser0TniXuu/eauYmrwM4o64EBvySxNzITEOLlm4igec= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= @@ -786,8 +788,6 @@ github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJ github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI= github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= -github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0= -github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/6d8ulp4AwfLKrmA= github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= diff --git a/heartbeat/monitors/monitor.go b/heartbeat/monitors/monitor.go index 8fa82c10ea14..743cb0fd795b 100644 --- a/heartbeat/monitors/monitor.go +++ b/heartbeat/monitors/monitor.go @@ -23,7 +23,7 @@ import ( "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/heartbeat/monitors/wrappers/wrappers.go b/heartbeat/monitors/wrappers/wrappers.go index 411634cac771..0b5727717186 100644 --- a/heartbeat/monitors/wrappers/wrappers.go +++ b/heartbeat/monitors/wrappers/wrappers.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/cfgfile/glob_watcher.go b/libbeat/cfgfile/glob_watcher.go index 6c86dc62bdb1..39d38929f51a 100644 --- a/libbeat/cfgfile/glob_watcher.go +++ b/libbeat/cfgfile/glob_watcher.go @@ -22,7 +22,7 @@ import ( "path/filepath" "time" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/cfgfile/list.go b/libbeat/cfgfile/list.go index 96fce6e2c7eb..f393fbdb33dc 100644 --- a/libbeat/cfgfile/list.go +++ b/libbeat/cfgfile/list.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/common" diff --git a/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go b/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go index ea67550f72f0..abda7d0e52f4 100644 --- a/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go +++ b/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter" "github.com/elastic/beats/v7/libbeat/common" diff --git a/libbeat/otelbeat/oteltranslate/tls_otel.go b/libbeat/otelbeat/oteltranslate/tls_otel.go index b20a53e51846..0bf3b0694861 100644 --- a/libbeat/otelbeat/oteltranslate/tls_otel.go +++ b/libbeat/otelbeat/oteltranslate/tls_otel.go @@ -24,7 +24,7 @@ import ( "reflect" "strings" - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" "go.opentelemetry.io/collector/config/configtls" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/processors/ratelimit/rate_limit.go b/libbeat/processors/ratelimit/rate_limit.go index 4d2744b5ed82..06c534c8b836 100644 --- a/libbeat/processors/ratelimit/rate_limit.go +++ b/libbeat/processors/ratelimit/rate_limit.go @@ -24,8 +24,8 @@ import ( "strconv" "sync/atomic" + "github.com/gohugoio/hashstructure" "github.com/jonboulle/clockwork" - "github.com/mitchellh/hashstructure" "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/processors" diff --git a/libbeat/processors/timeseries/timeseries.go b/libbeat/processors/timeseries/timeseries.go index 2080cde1849d..b88d2fbabfe1 100644 --- a/libbeat/processors/timeseries/timeseries.go +++ b/libbeat/processors/timeseries/timeseries.go @@ -25,7 +25,7 @@ import ( "github.com/elastic/beats/v7/libbeat/mapping" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" ) type timeseriesProcessor struct { diff --git a/libbeat/processors/timeseries/timeseries_test.go b/libbeat/processors/timeseries/timeseries_test.go index 7c9b77ca02f4..3d289cb9574d 100644 --- a/libbeat/processors/timeseries/timeseries_test.go +++ b/libbeat/processors/timeseries/timeseries_test.go @@ -142,7 +142,7 @@ func TestTimesSeriesHashes(t *testing.T) { "second": "word2", "third": "word3", }, - "timeseries": mapstr.M{"instance": uint64(10259802856000774733)}, + "timeseries": mapstr.M{"instance": uint64(7532097560335212001)}, }, }, { @@ -162,7 +162,7 @@ func TestTimesSeriesHashes(t *testing.T) { "third": "word3", }, "not-a-dimension": 1000, - "timeseries": mapstr.M{"instance": uint64(10259802856000774733)}, // same as above + "timeseries": mapstr.M{"instance": uint64(7532097560335212001)}, // same as above }, }, { @@ -184,7 +184,7 @@ func TestTimesSeriesHashes(t *testing.T) { }, "not-a-dimension": 1000, "dimension-by-default": "dimension1", - "timeseries": mapstr.M{"instance": uint64(17933311421196639387)}, + "timeseries": mapstr.M{"instance": uint64(16374068651038541136)}, }, }, } { diff --git a/metricbeat/beater/metricbeat.go b/metricbeat/beater/metricbeat.go index 40fb00eada4f..ecafbfdc1373 100644 --- a/metricbeat/beater/metricbeat.go +++ b/metricbeat/beater/metricbeat.go @@ -32,7 +32,7 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" // include all metricbeat specific builders _ "github.com/elastic/beats/v7/metricbeat/autodiscover/builder/hints" diff --git a/metricbeat/helper/prometheus/ptest/ptest.go b/metricbeat/helper/prometheus/ptest/ptest.go index ad055c989517..9294300b97bb 100644 --- a/metricbeat/helper/prometheus/ptest/ptest.go +++ b/metricbeat/helper/prometheus/ptest/ptest.go @@ -26,7 +26,7 @@ import ( "sort" "testing" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/stretchr/testify/assert" diff --git a/metricbeat/mb/testing/testdata.go b/metricbeat/mb/testing/testdata.go index 7c7814d4b431..e5bb4a9f8fc2 100644 --- a/metricbeat/mb/testing/testdata.go +++ b/metricbeat/mb/testing/testdata.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "gopkg.in/yaml.v2" "github.com/elastic/beats/v7/libbeat/asset" diff --git a/metricbeat/module/haproxy/haproxy.go b/metricbeat/module/haproxy/haproxy.go index dcc639dcc87c..16691cd0a055 100644 --- a/metricbeat/module/haproxy/haproxy.go +++ b/metricbeat/module/haproxy/haproxy.go @@ -28,8 +28,8 @@ import ( "net/url" "strings" + "github.com/go-viper/mapstructure/v2" "github.com/gocarina/gocsv" - "github.com/mitchellh/mapstructure" "github.com/elastic/beats/v7/metricbeat/helper" "github.com/elastic/beats/v7/metricbeat/mb" diff --git a/metricbeat/module/kubernetes/kubernetes.go b/metricbeat/module/kubernetes/kubernetes.go index 5725ad817e17..fe51341fc674 100644 --- a/metricbeat/module/kubernetes/kubernetes.go +++ b/metricbeat/module/kubernetes/kubernetes.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/beats/v7/metricbeat/helper" p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" diff --git a/metricbeat/module/system/service/service.go b/metricbeat/module/system/service/service.go index f46e8c0287ae..a7b648be7832 100644 --- a/metricbeat/module/system/service/service.go +++ b/metricbeat/module/system/service/service.go @@ -24,7 +24,7 @@ import ( "path/filepath" "github.com/coreos/go-systemd/v22/dbus" - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/elastic/beats/v7/metricbeat/mb" diff --git a/packetbeat/beater/processor.go b/packetbeat/beater/processor.go index 57ef75fb0d8a..831da131617e 100644 --- a/packetbeat/beater/processor.go +++ b/packetbeat/beater/processor.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/cfgfile" diff --git a/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go b/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go index 88f702ca44fa..11d33aa34bbd 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go +++ b/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go @@ -13,7 +13,7 @@ import ( "path/filepath" "sync" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipereader" "github.com/elastic/elastic-agent-libs/config" diff --git a/x-pack/filebeat/input/gcppubsub/input.go b/x-pack/filebeat/input/gcppubsub/input.go index a2223146469f..c06fe9e3846e 100644 --- a/x-pack/filebeat/input/gcppubsub/input.go +++ b/x-pack/filebeat/input/gcppubsub/input.go @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" "github.com/elastic/beats/v7/filebeat/channel" "github.com/elastic/beats/v7/filebeat/input" diff --git a/x-pack/libbeat/common/otelbeat/status/runner.go b/x-pack/libbeat/common/otelbeat/status/runner.go index fa45986ad129..be3c5d11763e 100644 --- a/x-pack/libbeat/common/otelbeat/status/runner.go +++ b/x-pack/libbeat/common/otelbeat/status/runner.go @@ -12,7 +12,7 @@ import ( "github.com/elastic/beats/v7/libbeat/management/status" "github.com/elastic/elastic-agent-libs/config" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" ) type statusFactory struct { diff --git a/x-pack/metricbeat/module/containerd/containerd.go b/x-pack/metricbeat/module/containerd/containerd.go index f7c5fabf205e..6343e66e280d 100644 --- a/x-pack/metricbeat/module/containerd/containerd.go +++ b/x-pack/metricbeat/module/containerd/containerd.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/mitchellh/hashstructure" + "github.com/gohugoio/hashstructure" p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" "github.com/elastic/beats/v7/metricbeat/mb"