Skip to content

Commit ac154e1

Browse files
authored
Merge pull request #49 from cortexproject/upgrade-cortex
Upgrade cortex to v1.18.1
2 parents aeb499d + 150608a commit ac154e1

File tree

1,146 files changed

+136372
-49269
lines changed

Some content is hidden

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

1,146 files changed

+136372
-49269
lines changed

go.mod

Lines changed: 88 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/cortexproject/cortex-tools
33
go 1.22.2
44

55
require (
6-
cloud.google.com/go/storage v1.36.0
6+
cloud.google.com/go/storage v1.41.0
77
github.com/alecthomas/chroma v0.7.0
8-
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
9-
github.com/cortexproject/cortex v1.17.0
8+
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30
9+
github.com/cortexproject/cortex v1.18.1
1010
github.com/go-kit/log v0.2.1
1111
github.com/gogo/protobuf v1.3.2
1212
github.com/golang/snappy v0.0.4
@@ -21,38 +21,39 @@ require (
2121
github.com/opentracing-contrib/go-stdlib v1.0.0
2222
github.com/pkg/errors v0.9.1
2323
github.com/prometheus/alertmanager v0.27.0
24-
github.com/prometheus/client_golang v1.19.0
25-
github.com/prometheus/common v0.49.1-0.20240306132007-4199f18c3e92
26-
github.com/prometheus/prometheus v0.51.1-0.20240328124728-d81e41d58ec8
24+
github.com/prometheus/client_golang v1.19.1
25+
github.com/prometheus/common v0.55.0
26+
github.com/prometheus/prometheus v0.54.0-rc.0
2727
github.com/sirupsen/logrus v1.9.3
2828
github.com/stretchr/testify v1.9.0
29-
github.com/thanos-io/objstore v0.0.0-20240309075357-e8336a5fd5f3
30-
github.com/thanos-io/thanos v0.34.2-0.20240423183430-7c8fe85682a5
29+
github.com/thanos-io/objstore v0.0.0-20240622095743-1afe5d4bc3cd
30+
github.com/thanos-io/thanos v0.35.2-0.20240722172812-990a60b72647
3131
github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
32-
golang.org/x/sync v0.6.0
33-
google.golang.org/api v0.168.0
32+
golang.org/x/sync v0.8.0
33+
google.golang.org/api v0.188.0
3434
gopkg.in/alecthomas/kingpin.v2 v2.2.6
3535
gopkg.in/yaml.v2 v2.4.0
3636
gopkg.in/yaml.v3 v3.0.1
3737
gotest.tools v2.2.0+incompatible
3838
)
3939

4040
require (
41-
cloud.google.com/go v0.112.0 // indirect
42-
cloud.google.com/go/compute v1.23.4 // indirect
43-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
44-
cloud.google.com/go/iam v1.1.6 // indirect
45-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
46-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
47-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
41+
cloud.google.com/go v0.115.0 // indirect
42+
cloud.google.com/go/auth v0.7.0 // indirect
43+
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
44+
cloud.google.com/go/compute/metadata v0.4.0 // indirect
45+
cloud.google.com/go/iam v1.1.10 // indirect
46+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
47+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
48+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
4849
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0 // indirect
49-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
50-
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
50+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
51+
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
5152
github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
5253
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
5354
github.com/armon/go-metrics v0.4.1 // indirect
5455
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
55-
github.com/aws/aws-sdk-go v1.50.32 // indirect
56+
github.com/aws/aws-sdk-go v1.55.5 // indirect
5657
github.com/aws/aws-sdk-go-v2 v1.16.16 // indirect
5758
github.com/aws/aws-sdk-go-v2/config v1.15.1 // indirect
5859
github.com/aws/aws-sdk-go-v2/credentials v1.12.20 // indirect
@@ -70,7 +71,7 @@ require (
7071
github.com/blang/semver/v4 v4.0.0 // indirect
7172
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
7273
github.com/cespare/xxhash v1.1.0 // indirect
73-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
74+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7475
github.com/coreos/go-semver v0.3.0 // indirect
7576
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7677
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
@@ -82,25 +83,27 @@ require (
8283
github.com/efficientgo/core v1.0.0-rc.2 // indirect
8384
github.com/efficientgo/tools/extkingpin v0.0.0-20220817170617-6c25e3b627dd // indirect
8485
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
85-
github.com/fatih/color v1.15.0 // indirect
86+
github.com/fatih/color v1.16.0 // indirect
8687
github.com/felixge/httpsnoop v1.0.4 // indirect
8788
github.com/fsnotify/fsnotify v1.7.0 // indirect
89+
github.com/go-ini/ini v1.67.0 // indirect
8890
github.com/go-logfmt/logfmt v0.6.0 // indirect
89-
github.com/go-logr/logr v1.4.1 // indirect
91+
github.com/go-logr/logr v1.4.2 // indirect
9092
github.com/go-logr/stdr v1.2.2 // indirect
91-
github.com/go-openapi/analysis v0.22.2 // indirect
92-
github.com/go-openapi/errors v0.21.1 // indirect
93-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
94-
github.com/go-openapi/jsonreference v0.20.4 // indirect
95-
github.com/go-openapi/loads v0.21.5 // indirect
96-
github.com/go-openapi/runtime v0.27.1 // indirect
97-
github.com/go-openapi/spec v0.20.14 // indirect
98-
github.com/go-openapi/strfmt v0.22.2 // indirect
93+
github.com/go-openapi/analysis v0.23.0 // indirect
94+
github.com/go-openapi/errors v0.22.0 // indirect
95+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
96+
github.com/go-openapi/jsonreference v0.21.0 // indirect
97+
github.com/go-openapi/loads v0.22.0 // indirect
98+
github.com/go-openapi/runtime v0.28.0 // indirect
99+
github.com/go-openapi/spec v0.21.0 // indirect
100+
github.com/go-openapi/strfmt v0.23.0 // indirect
99101
github.com/go-openapi/swag v0.23.0 // indirect
100-
github.com/go-openapi/validate v0.23.0 // indirect
102+
github.com/go-openapi/validate v0.24.0 // indirect
103+
github.com/goccy/go-json v0.10.3 // indirect
101104
github.com/gogo/googleapis v1.4.0 // indirect
102105
github.com/gogo/status v1.1.1 // indirect
103-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
106+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
104107
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
105108
github.com/golang/protobuf v1.5.4 // indirect
106109
github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac // indirect
@@ -109,50 +112,51 @@ require (
109112
github.com/gonum/internal v0.0.0-20181124074243-f884aa714029 // indirect
110113
github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9 // indirect
111114
github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9 // indirect
112-
github.com/google/btree v1.0.1 // indirect
115+
github.com/google/btree v1.1.2 // indirect
113116
github.com/google/go-cmp v0.6.0 // indirect
114117
github.com/google/go-querystring v1.1.0 // indirect
115118
github.com/google/s2a-go v0.1.7 // indirect
116119
github.com/google/uuid v1.6.0 // indirect
117120
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
118-
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
121+
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
119122
github.com/gosimple/slug v1.1.1 // indirect
120-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
123+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
121124
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
122-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
123-
github.com/hashicorp/consul/api v1.28.2 // indirect
125+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
126+
github.com/hashicorp/consul/api v1.29.2 // indirect
124127
github.com/hashicorp/errwrap v1.1.0 // indirect
125128
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
126-
github.com/hashicorp/go-hclog v1.5.0 // indirect
129+
github.com/hashicorp/go-hclog v1.6.3 // indirect
127130
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
128131
github.com/hashicorp/go-msgpack v0.5.5 // indirect
129132
github.com/hashicorp/go-multierror v1.1.1 // indirect
130133
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
131134
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
132-
github.com/hashicorp/go-version v1.6.0 // indirect
133135
github.com/hashicorp/golang-lru v0.6.0 // indirect
134-
github.com/hashicorp/memberlist v0.5.0 // indirect
136+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
137+
github.com/hashicorp/memberlist v0.5.1 // indirect
135138
github.com/hashicorp/serf v0.10.1 // indirect
136139
github.com/jmespath/go-jmespath v0.4.0 // indirect
137140
github.com/josharian/intern v1.0.0 // indirect
138141
github.com/jpillora/backoff v1.0.0 // indirect
139142
github.com/json-iterator/go v1.1.12 // indirect
140143
github.com/julienschmidt/httprouter v1.3.0 // indirect
141-
github.com/klauspost/compress v1.17.8 // indirect
142-
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
144+
github.com/klauspost/compress v1.17.9 // indirect
145+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
143146
github.com/kylelemons/godebug v1.1.0 // indirect
144147
github.com/mailru/easyjson v0.7.7 // indirect
145148
github.com/mattn/go-colorable v0.1.13 // indirect
146-
github.com/mattn/go-isatty v0.0.19 // indirect
149+
github.com/mattn/go-isatty v0.0.20 // indirect
147150
github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect
148-
github.com/miekg/dns v1.1.58 // indirect
151+
github.com/miekg/dns v1.1.61 // indirect
149152
github.com/minio/md5-simd v1.1.2 // indirect
150-
github.com/minio/minio-go/v7 v7.0.69 // indirect
153+
github.com/minio/minio-go/v7 v7.0.75 // indirect
151154
github.com/minio/sha256-simd v1.0.1 // indirect
152155
github.com/mitchellh/go-homedir v1.1.0 // indirect
153156
github.com/mitchellh/mapstructure v1.5.0 // indirect
154157
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
155158
github.com/modern-go/reflect2 v1.0.2 // indirect
159+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
156160
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
157161
github.com/ncw/swift v1.0.53 // indirect
158162
github.com/oklog/run v1.1.0 // indirect
@@ -161,10 +165,10 @@ require (
161165
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
162166
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
163167
github.com/prometheus-community/prom-label-proxy v0.8.1-0.20240127162815-c1195f9aabc0 // indirect
164-
github.com/prometheus/client_model v0.6.0 // indirect
168+
github.com/prometheus/client_model v0.6.1 // indirect
165169
github.com/prometheus/common/sigv4 v0.1.0 // indirect
166170
github.com/prometheus/exporter-toolkit v0.11.0 // indirect
167-
github.com/prometheus/procfs v0.12.0 // indirect
171+
github.com/prometheus/procfs v0.15.1 // indirect
168172
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
169173
github.com/redis/rueidis v1.0.14-go1.18 // indirect
170174
github.com/rs/xid v1.5.0 // indirect
@@ -173,58 +177,56 @@ require (
173177
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
174178
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
175179
github.com/soheilhy/cmux v0.1.5 // indirect
176-
github.com/sony/gobreaker v0.5.0 // indirect
180+
github.com/sony/gobreaker v1.0.0 // indirect
177181
github.com/stretchr/objx v0.5.2 // indirect
182+
github.com/thanos-io/promql-engine v0.0.0-20240718195911-cdbd6dfed36b // indirect
178183
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
179184
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
180185
github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a // indirect
181186
github.com/weaveworks/promrus v1.2.0 // indirect
182-
go.etcd.io/etcd/api/v3 v3.5.13 // indirect
183-
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
184-
go.etcd.io/etcd/client/v3 v3.5.13 // indirect
187+
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
188+
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
189+
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
185190
go.mongodb.org/mongo-driver v1.14.0 // indirect
186191
go.opencensus.io v0.24.0 // indirect
187-
go.opentelemetry.io/collector/featuregate v1.3.0 // indirect
188-
go.opentelemetry.io/collector/pdata v1.3.0 // indirect
189-
go.opentelemetry.io/collector/semconv v0.96.0 // indirect
192+
go.opentelemetry.io/collector/pdata v1.12.0 // indirect
193+
go.opentelemetry.io/collector/semconv v0.105.0 // indirect
190194
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
191-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
192-
go.opentelemetry.io/contrib/propagators/autoprop v0.38.0 // indirect
193-
go.opentelemetry.io/contrib/propagators/aws v1.22.0 // indirect
194-
go.opentelemetry.io/contrib/propagators/b3 v1.13.0 // indirect
195-
go.opentelemetry.io/contrib/propagators/jaeger v1.13.0 // indirect
196-
go.opentelemetry.io/contrib/propagators/ot v1.13.0 // indirect
197-
go.opentelemetry.io/otel v1.25.0 // indirect
198-
go.opentelemetry.io/otel/bridge/opentracing v1.22.0 // indirect
199-
go.opentelemetry.io/otel/metric v1.25.0 // indirect
200-
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
201-
go.opentelemetry.io/otel/trace v1.25.0 // indirect
195+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
196+
go.opentelemetry.io/contrib/propagators/autoprop v0.53.0 // indirect
197+
go.opentelemetry.io/contrib/propagators/aws v1.28.0 // indirect
198+
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
199+
go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect
200+
go.opentelemetry.io/contrib/propagators/ot v1.28.0 // indirect
201+
go.opentelemetry.io/otel v1.28.0 // indirect
202+
go.opentelemetry.io/otel/bridge/opentracing v1.28.0 // indirect
203+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
204+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
205+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
202206
go.uber.org/atomic v1.11.0 // indirect
203207
go.uber.org/goleak v1.3.0 // indirect
204208
go.uber.org/multierr v1.11.0 // indirect
205209
go.uber.org/zap v1.21.0 // indirect
206210
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
207211
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
208-
golang.org/x/crypto v0.22.0 // indirect
209-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
210-
golang.org/x/mod v0.16.0 // indirect
211-
golang.org/x/net v0.24.0 // indirect
212-
golang.org/x/oauth2 v0.18.0 // indirect
213-
golang.org/x/sys v0.19.0 // indirect
214-
golang.org/x/text v0.14.0 // indirect
215-
golang.org/x/time v0.5.0 // indirect
216-
golang.org/x/tools v0.19.0 // indirect
217-
google.golang.org/appengine v1.6.8 // indirect
218-
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
219-
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
220-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect
221-
google.golang.org/grpc v1.62.1 // indirect
222-
google.golang.org/protobuf v1.33.0 // indirect
223-
gopkg.in/ini.v1 v1.67.0 // indirect
224-
k8s.io/apimachinery v0.29.3 // indirect
225-
k8s.io/client-go v0.29.3 // indirect
226-
k8s.io/klog/v2 v2.120.1 // indirect
227-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
212+
golang.org/x/crypto v0.25.0 // indirect
213+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
214+
golang.org/x/mod v0.19.0 // indirect
215+
golang.org/x/net v0.27.0 // indirect
216+
golang.org/x/oauth2 v0.21.0 // indirect
217+
golang.org/x/sys v0.22.0 // indirect
218+
golang.org/x/text v0.16.0 // indirect
219+
golang.org/x/time v0.6.0 // indirect
220+
golang.org/x/tools v0.23.0 // indirect
221+
google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect
222+
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
223+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
224+
google.golang.org/grpc v1.65.0 // indirect
225+
google.golang.org/protobuf v1.34.2 // indirect
226+
k8s.io/apimachinery v0.30.2 // indirect
227+
k8s.io/client-go v0.30.2 // indirect
228+
k8s.io/klog/v2 v2.130.1 // indirect
229+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
228230
)
229231

230232
// Override since git.apache.org is down. The docs say to fetch from github.

0 commit comments

Comments
 (0)