From 8b50469bf3b8a647e7f3ea6db6b06882288cdb31 Mon Sep 17 00:00:00 2001 From: tommyers-elastic <106530686+tommyers-elastic@users.noreply.github.com> Date: Mon, 3 Mar 2025 10:40:19 +0000 Subject: [PATCH] include vendored module version in file path --- .../0.54.1 => prometheus@v0.54.1}/LICENSE | 0 .../0.54.1 => prometheus@v0.54.1}/NOTICE | 0 .../0.54.1 => prometheus@v0.54.1}/go.mod | 20 +++++++++---------- .../0.54.1 => prometheus@v0.54.1}/go.sum | 20 ++++++------------- .../model/exemplar/exemplar.go | 0 .../model/histogram/float_histogram.go | 0 .../model/histogram/generic.go | 0 .../model/histogram/histogram.go | 0 .../model/histogram/test_utils.go | 0 .../model/labels/labels.go | 0 .../model/labels/labels_common.go | 0 .../model/labels/labels_dedupelabels.go | 0 .../model/labels/labels_stringlabels.go | 0 .../model/labels/matcher.go | 0 .../model/labels/regexp.go | 0 .../model/labels/sharding.go | 0 .../model/labels/sharding_dedupelabels.go | 0 .../model/labels/sharding_stringlabels.go | 0 .../model/labels/test_utils.go | 0 .../model/textparse/README.md | 0 .../model/textparse/interface.go | 0 .../model/textparse/openmetricslex.l | 0 .../model/textparse/openmetricslex.l.go | 0 .../model/textparse/openmetricsparse.go | 2 +- .../model/textparse/promlex.l | 0 .../model/textparse/promlex.l.go | 0 .../model/textparse/promparse.go | 2 +- .../model/textparse/promtestdata.nometa.txt | 0 .../model/textparse/promtestdata.txt | 0 .../model/textparse/protobufparse.go | 0 .../model/timestamp/timestamp.go | 0 .../model/value/value.go | 0 .../prompb/README.md | 0 .../prompb/buf.lock | 0 .../prompb/buf.yaml | 0 .../prompb/codec.go | 0 .../prompb/custom.go | 0 .../prompb/io/prometheus/client/metrics.pb.go | 0 .../prompb/io/prometheus/client/metrics.proto | 0 .../prompb/remote.pb.go | 0 .../prompb/remote.proto | 0 .../prompb/types.pb.go | 0 .../prompb/types.proto | 0 go.mod | 7 +++---- go.sum | 16 ++++++++++----- 45 files changed, 32 insertions(+), 35 deletions(-) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/LICENSE (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/NOTICE (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/go.mod (53%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/go.sum (74%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/exemplar/exemplar.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/histogram/float_histogram.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/histogram/generic.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/histogram/histogram.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/histogram/test_utils.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/labels.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/labels_common.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/labels_dedupelabels.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/labels_stringlabels.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/matcher.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/regexp.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/sharding.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/sharding_dedupelabels.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/sharding_stringlabels.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/labels/test_utils.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/README.md (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/interface.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/openmetricslex.l (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/openmetricslex.l.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/openmetricsparse.go (99%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/promlex.l (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/promlex.l.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/promparse.go (99%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/promtestdata.nometa.txt (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/promtestdata.txt (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/textparse/protobufparse.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/timestamp/timestamp.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/model/value/value.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/README.md (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/buf.lock (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/buf.yaml (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/codec.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/custom.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/io/prometheus/client/metrics.pb.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/io/prometheus/client/metrics.proto (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/remote.pb.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/remote.proto (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/types.pb.go (100%) rename _vendor/github.com/prometheus/{prometheus/0.54.1 => prometheus@v0.54.1}/prompb/types.proto (100%) diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/LICENSE b/_vendor/github.com/prometheus/prometheus@v0.54.1/LICENSE similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/LICENSE rename to _vendor/github.com/prometheus/prometheus@v0.54.1/LICENSE diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/NOTICE b/_vendor/github.com/prometheus/prometheus@v0.54.1/NOTICE similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/NOTICE rename to _vendor/github.com/prometheus/prometheus@v0.54.1/NOTICE diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/go.mod b/_vendor/github.com/prometheus/prometheus@v0.54.1/go.mod similarity index 53% rename from _vendor/github.com/prometheus/prometheus/0.54.1/go.mod rename to _vendor/github.com/prometheus/prometheus@v0.54.1/go.mod index c2f135f97f96..512113db89a4 100644 --- a/_vendor/github.com/prometheus/prometheus/0.54.1/go.mod +++ b/_vendor/github.com/prometheus/prometheus@v0.54.1/go.mod @@ -1,22 +1,25 @@ module github.com/prometheus/prometheus -go 1.22.7 +go 1.21.0 -toolchain go1.23.4 +toolchain go1.22.5 require ( github.com/cespare/xxhash/v2 v2.3.0 github.com/gogo/protobuf v1.3.2 github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc - github.com/prometheus/common v0.62.0 - golang.org/x/text v0.21.0 + github.com/prometheus/common v0.55.0 + golang.org/x/text v0.16.0 ) require ( - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - google.golang.org/protobuf v1.36.4 // indirect + google.golang.org/protobuf v1.34.2 // indirect +) + +replace ( + k8s.io/klog => github.com/simonpasquier/klog-gokit v0.3.0 + k8s.io/klog/v2 => github.com/simonpasquier/klog-gokit/v3 v3.3.0 ) // Exclude linodego v1.0.0 as it is no longer published on github. @@ -27,6 +30,3 @@ exclude ( github.com/grpc-ecosystem/grpc-gateway v1.14.7 google.golang.org/api v0.30.0 ) - -// Pin until https://github.com/fsnotify/fsnotify/issues/656 is resolved. -replace github.com/fsnotify/fsnotify v1.8.0 => github.com/fsnotify/fsnotify v1.7.0 diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/go.sum b/_vendor/github.com/prometheus/prometheus@v0.54.1/go.sum similarity index 74% rename from _vendor/github.com/prometheus/prometheus/0.54.1/go.sum rename to _vendor/github.com/prometheus/prometheus@v0.54.1/go.sum index 89cc700f5fa4..3ba5ea20b92c 100644 --- a/_vendor/github.com/prometheus/prometheus/0.54.1/go.sum +++ b/_vendor/github.com/prometheus/prometheus@v0.54.1/go.sum @@ -1,7 +1,5 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -10,14 +8,10 @@ github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrR github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= -github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -37,8 +31,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -47,7 +41,5 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= -google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/exemplar/exemplar.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/exemplar/exemplar.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/exemplar/exemplar.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/exemplar/exemplar.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/float_histogram.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/float_histogram.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/float_histogram.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/float_histogram.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/generic.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/generic.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/generic.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/generic.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/histogram.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/histogram.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/histogram.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/histogram.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/test_utils.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/test_utils.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/histogram/test_utils.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/histogram/test_utils.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels_common.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels_common.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels_common.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels_common.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels_dedupelabels.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels_dedupelabels.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels_dedupelabels.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels_dedupelabels.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels_stringlabels.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels_stringlabels.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/labels_stringlabels.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/labels_stringlabels.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/matcher.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/matcher.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/matcher.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/matcher.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/regexp.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/regexp.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/regexp.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/regexp.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/sharding.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/sharding.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/sharding.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/sharding.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/sharding_dedupelabels.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/sharding_dedupelabels.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/sharding_dedupelabels.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/sharding_dedupelabels.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/sharding_stringlabels.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/sharding_stringlabels.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/sharding_stringlabels.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/sharding_stringlabels.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/labels/test_utils.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/test_utils.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/labels/test_utils.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/labels/test_utils.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/README.md b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/README.md similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/README.md rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/README.md diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/interface.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/interface.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/interface.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/interface.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/openmetricslex.l b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/openmetricslex.l similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/openmetricslex.l rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/openmetricslex.l diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/openmetricslex.l.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/openmetricslex.l.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/openmetricslex.l.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/openmetricslex.l.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/openmetricsparse.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/openmetricsparse.go similarity index 99% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/openmetricsparse.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/openmetricsparse.go index b011d8204bea..ac14cbfe64f6 100644 --- a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/openmetricsparse.go +++ b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/openmetricsparse.go @@ -220,7 +220,7 @@ func (p *OpenMetricsParser) Exemplar(e *exemplar.Exemplar) bool { } // CreatedTimestamp returns nil as it's not implemented yet. -// TODO(bwplotka): https://github.com/prometheus/prometheus/v2/issues/12980 +// TODO(bwplotka): https://github.com/prometheus/prometheus/issues/12980 func (p *OpenMetricsParser) CreatedTimestamp() *int64 { return nil } diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promlex.l b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promlex.l similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promlex.l rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promlex.l diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promlex.l.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promlex.l.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promlex.l.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promlex.l.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promparse.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promparse.go similarity index 99% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promparse.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promparse.go index 9acd6090060b..a9aada3e3ef0 100644 --- a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promparse.go +++ b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promparse.go @@ -257,7 +257,7 @@ func (p *PromParser) Exemplar(*exemplar.Exemplar) bool { } // CreatedTimestamp returns nil as it's not implemented yet. -// TODO(bwplotka): https://github.com/prometheus/prometheus/v2/issues/12980 +// TODO(bwplotka): https://github.com/prometheus/prometheus/issues/12980 func (p *PromParser) CreatedTimestamp() *int64 { return nil } diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promtestdata.nometa.txt b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promtestdata.nometa.txt similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promtestdata.nometa.txt rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promtestdata.nometa.txt diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promtestdata.txt b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promtestdata.txt similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/promtestdata.txt rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/promtestdata.txt diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/protobufparse.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/protobufparse.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/textparse/protobufparse.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/textparse/protobufparse.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/timestamp/timestamp.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/timestamp/timestamp.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/timestamp/timestamp.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/timestamp/timestamp.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/model/value/value.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/model/value/value.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/model/value/value.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/model/value/value.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/README.md b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/README.md similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/README.md rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/README.md diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/buf.lock b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/buf.lock similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/buf.lock rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/buf.lock diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/buf.yaml b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/buf.yaml similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/buf.yaml rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/buf.yaml diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/codec.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/codec.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/codec.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/codec.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/custom.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/custom.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/custom.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/custom.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/io/prometheus/client/metrics.pb.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/io/prometheus/client/metrics.pb.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/io/prometheus/client/metrics.pb.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/io/prometheus/client/metrics.pb.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/io/prometheus/client/metrics.proto b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/io/prometheus/client/metrics.proto similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/io/prometheus/client/metrics.proto rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/io/prometheus/client/metrics.proto diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/remote.pb.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/remote.pb.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/remote.pb.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/remote.pb.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/remote.proto b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/remote.proto similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/remote.proto rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/remote.proto diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/types.pb.go b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/types.pb.go similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/types.pb.go rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/types.pb.go diff --git a/_vendor/github.com/prometheus/prometheus/0.54.1/prompb/types.proto b/_vendor/github.com/prometheus/prometheus@v0.54.1/prompb/types.proto similarity index 100% rename from _vendor/github.com/prometheus/prometheus/0.54.1/prompb/types.proto rename to _vendor/github.com/prometheus/prometheus@v0.54.1/prompb/types.proto diff --git a/go.mod b/go.mod index 270367a186bb..fb2de5fbc2e6 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.62.0 + github.com/prometheus/common v0.60.1 github.com/prometheus/procfs v0.15.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e // indirect @@ -138,7 +138,7 @@ require ( google.golang.org/api v0.214.0 google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect google.golang.org/grpc v1.67.3 - google.golang.org/protobuf v1.36.4 + google.golang.org/protobuf v1.35.2 gopkg.in/inf.v0 v0.9.1 gopkg.in/yaml.v2 v2.4.0 gotest.tools/gotestsum v1.7.0 @@ -493,6 +493,5 @@ replace ( github.com/google/gopacket => github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6 github.com/insomniacslk/dhcp => github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 // indirect github.com/meraki/dashboard-api-go/v3 => github.com/tommyers-elastic/dashboard-api-go/v3 v3.0.0-20240913150833-a945473a8f25 - - github.com/prometheus/prometheus/v2 => ./_vendor/github.com/prometheus/prometheus/0.54.1 + github.com/prometheus/prometheus/v2 => ./_vendor/github.com/prometheus/prometheus@v0.54.1 ) diff --git a/go.sum b/go.sum index d81c630fea1e..5d1702535981 100644 --- a/go.sum +++ b/go.sum @@ -440,6 +440,8 @@ github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkPro github.com/go-faker/faker/v4 v4.2.0 h1:dGebOupKwssrODV51E0zbMrv5e2gO9VWSLNC1WDCpWg= github.com/go-faker/faker/v4 v4.2.0/go.mod h1:F/bBy8GH9NxOxMInug5Gx4WYeG6fHJZ8Ol/dhcpRub4= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A= github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -776,6 +778,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc= github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -839,13 +842,15 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= -github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= +github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc= +github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/prometheus/prometheus v0.54.1 h1:vKuwQNjnYN2/mDoWfHXDhAsz/68q/dQDb+YbcEqU7MQ= +github.com/prometheus/prometheus v0.54.1/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= @@ -1115,8 +1120,9 @@ go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQD go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= @@ -1342,8 +1348,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= -google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=