Skip to content

Commit da2ad99

Browse files
alanprotalanprot
authored
[chore] Update Prometheus/Thanos/Thanos engine (#5177)
* Updating Dependencies Signed-off-by: Alan Protasio <[email protected]> * fix test Signed-off-by: Alan Protasio <[email protected]> * fix ling Signed-off-by: Alan Protasio <[email protected]> * fix test Signed-off-by: Alan Protasio <[email protected]> * Adding KeepFiringFor on the response Signed-off-by: Alan Protasio <[email protected]> * changelog Signed-off-by: Alan Protasio <[email protected]> --------- Signed-off-by: Alan Protasio <[email protected]>
1 parent 135ad29 commit da2ad99

File tree

442 files changed

+27620
-22718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

442 files changed

+27620
-22718
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* [FEATURE] Ring: Add new kv store option `dynamodb`. #5026
3232
* [FEATURE] Cache: Support redis as backend for caching bucket and index cache. #5057
3333
* [FEATURE] Querier/Store-Gateway: Added `-blocks-storage.bucket-store.ignore-blocks-within` allowing to filter out the recently created blocks from being synced by queriers and store-gateways. #5166
34+
* [FEATURE] AlertManager/Ruler: Added support for `keep_firing_for` on alerting rulers.
3435
* [BUGFIX] Updated `golang.org/x/net` dependency to fix CVE-2022-27664. #5008
3536
* [BUGFIX] Fix panic when otel and xray tracing is enabled. #5044
3637
* [BUGFIX] Fixed no compact block got grouped in shuffle sharding grouper. #5055

‎go.mod

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,24 @@ require (
4444
github.com/prometheus/alertmanager v0.25.0
4545
github.com/prometheus/client_golang v1.14.0
4646
github.com/prometheus/client_model v0.3.0
47-
github.com/prometheus/common v0.39.1-0.20230110141620-846591a16635
48-
github.com/prometheus/prometheus v0.41.0
47+
github.com/prometheus/common v0.39.1-0.20230202092144-f9c1994be032
48+
// Prometheus maps version 2.x.y to tags v0.x.y.
49+
github.com/prometheus/prometheus v0.42.0
4950
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
5051
github.com/sony/gobreaker v0.5.0
5152
github.com/spf13/afero v1.9.3
5253
github.com/stretchr/testify v1.8.1
53-
github.com/thanos-community/promql-engine v0.0.0-20230124070417-9e293186b7e4
54-
github.com/thanos-io/objstore v0.0.0-20221205132204-5aafc0079f06
55-
github.com/thanos-io/thanos v0.29.1-0.20230131102841-a3b6b10afb00
54+
github.com/thanos-community/promql-engine v0.0.0-20230224075812-ae04bbea7613
55+
github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204
56+
github.com/thanos-io/thanos v0.29.1-0.20230224131058-fdeea3917591
5657
github.com/uber/jaeger-client-go v2.30.0+incompatible
5758
github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
5859
go.etcd.io/etcd/api/v3 v3.5.7
5960
go.etcd.io/etcd/client/pkg/v3 v3.5.7
6061
go.etcd.io/etcd/client/v3 v3.5.7
6162
go.opentelemetry.io/contrib/propagators/aws v1.14.0
6263
go.opentelemetry.io/otel v1.13.0
63-
go.opentelemetry.io/otel/bridge/opentracing v1.11.1-0.20221013154440-84e28fd3bdb1
64+
go.opentelemetry.io/otel/bridge/opentracing v1.12.0
6465
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0
6566
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0
6667
go.opentelemetry.io/otel/sdk v1.13.0
@@ -77,15 +78,15 @@ require (
7778

7879
require (
7980
cloud.google.com/go v0.105.0 // indirect
80-
cloud.google.com/go/compute v1.13.0 // indirect
81-
cloud.google.com/go/compute/metadata v0.2.2 // indirect
81+
cloud.google.com/go/compute v1.14.0 // indirect
82+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
8283
cloud.google.com/go/iam v0.8.0 // indirect
8384
cloud.google.com/go/storage v1.27.0 // indirect
84-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0 // indirect
85-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 // indirect
86-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect
87-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1 // indirect
88-
github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 // indirect
85+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 // indirect
86+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 // indirect
87+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.1 // indirect
88+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.5.1 // indirect
89+
github.com/AzureAD/microsoft-authentication-library-for-go v0.7.0 // indirect
8990
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
9091
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
9192
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
@@ -113,10 +114,11 @@ require (
113114
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
114115
github.com/docker/go-units v0.5.0 // indirect
115116
github.com/edsrzf/mmap-go v1.1.0 // indirect
117+
github.com/efficientgo/tools/extkingpin v0.0.0-20220817170617-6c25e3b627dd // indirect
116118
github.com/fatih/color v1.13.0 // indirect
117119
github.com/felixge/httpsnoop v1.0.3 // indirect
118120
github.com/fsnotify/fsnotify v1.6.0 // indirect
119-
github.com/go-logfmt/logfmt v0.5.1 // indirect
121+
github.com/go-logfmt/logfmt v0.6.0 // indirect
120122
github.com/go-logr/logr v1.2.3 // indirect
121123
github.com/go-logr/stdr v1.2.2 // indirect
122124
github.com/go-openapi/analysis v0.21.4 // indirect
@@ -129,13 +131,13 @@ require (
129131
github.com/go-openapi/validate v0.22.0 // indirect
130132
github.com/gofrs/uuid v4.3.1+incompatible // indirect
131133
github.com/gogo/googleapis v1.4.0 // indirect
132-
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
134+
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
133135
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
134136
github.com/google/btree v1.0.1 // indirect
135137
github.com/google/go-cmp v0.5.9 // indirect
136-
github.com/google/pprof v0.0.0-20221212185716-aee1124e3a93 // indirect
138+
github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b // indirect
137139
github.com/google/uuid v1.3.0 // indirect
138-
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
140+
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
139141
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
140142
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
141143
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.1 // indirect
@@ -174,11 +176,11 @@ require (
174176
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
175177
github.com/prometheus/common/sigv4 v0.1.0 // indirect
176178
github.com/prometheus/exporter-toolkit v0.8.2 // indirect
177-
github.com/prometheus/procfs v0.8.0 // indirect
179+
github.com/prometheus/procfs v0.9.0 // indirect
178180
github.com/rogpeppe/go-internal v1.9.0 // indirect
179181
github.com/rs/cors v1.8.2 // indirect
180182
github.com/rs/xid v1.4.0 // indirect
181-
github.com/rueian/rueidis v0.0.90 // indirect
183+
github.com/rueian/rueidis v0.0.93 // indirect
182184
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
183185
github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
184186
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
@@ -191,29 +193,31 @@ require (
191193
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
192194
go.mongodb.org/mongo-driver v1.11.0 // indirect
193195
go.opencensus.io v0.24.0 // indirect
194-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect
195-
go.opentelemetry.io/contrib/propagators/autoprop v0.34.0 // indirect
196-
go.opentelemetry.io/contrib/propagators/b3 v1.9.0 // indirect
197-
go.opentelemetry.io/contrib/propagators/jaeger v1.9.0 // indirect
198-
go.opentelemetry.io/contrib/propagators/ot v1.9.0 // indirect
196+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 // indirect
197+
go.opentelemetry.io/contrib/propagators/autoprop v0.38.0 // indirect
198+
go.opentelemetry.io/contrib/propagators/b3 v1.13.0 // indirect
199+
go.opentelemetry.io/contrib/propagators/jaeger v1.13.0 // indirect
200+
go.opentelemetry.io/contrib/propagators/ot v1.13.0 // indirect
199201
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect
200-
go.opentelemetry.io/otel/metric v0.34.0 // indirect
202+
go.opentelemetry.io/otel/metric v0.36.0 // indirect
201203
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
202204
go.uber.org/goleak v1.2.0 // indirect
203-
go.uber.org/multierr v1.8.0 // indirect
205+
go.uber.org/multierr v1.9.0 // indirect
204206
go.uber.org/zap v1.21.0 // indirect
207+
go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
208+
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
205209
golang.org/x/crypto v0.6.0 // indirect
206-
golang.org/x/exp v0.0.0-20221212164502-fae10dda9338 // indirect
210+
golang.org/x/exp v0.0.0-20230124195608-d38c7dcee874 // indirect
207211
golang.org/x/mod v0.7.0 // indirect
208-
golang.org/x/oauth2 v0.3.0 // indirect
212+
golang.org/x/oauth2 v0.4.0 // indirect
209213
golang.org/x/sys v0.5.0 // indirect
210214
golang.org/x/text v0.7.0 // indirect
211-
golang.org/x/tools v0.4.0 // indirect
215+
golang.org/x/tools v0.5.0 // indirect
212216
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
213217
gonum.org/v1/gonum v0.12.0 // indirect
214-
google.golang.org/api v0.104.0 // indirect
218+
google.golang.org/api v0.108.0 // indirect
215219
google.golang.org/appengine v1.6.7 // indirect
216-
google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
220+
google.golang.org/genproto v0.0.0-20230131230820-1c016267d619 // indirect
217221
google.golang.org/protobuf v1.28.1 // indirect
218222
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
219223
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -241,3 +245,7 @@ replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.20.6
241245
replace github.com/ionos-cloud/sdk-go/v6 => github.com/ionos-cloud/sdk-go/v6 v6.0.4
242246

243247
replace github.com/googleapis/gnostic => github.com/google/gnostic v0.6.9
248+
249+
// Same replace used by thanos: (may be removed in the future)
250+
// https://github.com/thanos-io/thanos/blob/fdeea3917591fc363a329cbe23af37c6fff0b5f0/go.mod#L265
251+
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497

0 commit comments

Comments
 (0)