Skip to content

Commit 900acbc

Browse files
friedrichgfriedrichg
authored
Upgrade to v1.14.1 (#36)
* Update to cortex v1.14.1 Signed-off-by: Friedrich Gonzalez <[email protected]> * max-samples-per-query got removed after chunks removal Signed-off-by: Friedrich Gonzalez <[email protected]> * Apply some of the suggestions Signed-off-by: Friedrich Gonzalez <[email protected]> * Revert "Apply some of the suggestions" This reverts commit a57d5ff. Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: Friedrich Gonzalez <[email protected]>
1 parent f2909a3 commit 900acbc

File tree

2,012 files changed

+243974
-88610
lines changed

Some content is hidden

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

2,012 files changed

+243974
-88610
lines changed

‎go.mod

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

55
require (
6-
cloud.google.com/go/storage v1.10.0
6+
cloud.google.com/go/storage v1.27.0
77
github.com/alecthomas/chroma v0.7.0
88
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
9-
github.com/cortexproject/cortex v1.13.2
10-
github.com/go-kit/log v0.2.0
9+
github.com/cortexproject/cortex v1.14.1
10+
github.com/go-kit/log v0.2.1
1111
github.com/gogo/protobuf v1.3.2
1212
github.com/golang/snappy v0.0.4
1313
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b
@@ -21,39 +21,46 @@ 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.24.0
24-
github.com/prometheus/client_golang v1.12.1
25-
github.com/prometheus/common v0.33.0
26-
github.com/prometheus/prometheus v1.8.2-0.20220411232225-ce6a643ee88f
27-
github.com/sirupsen/logrus v1.8.1
28-
github.com/stretchr/testify v1.7.1
29-
github.com/thanos-io/thanos v0.22.0
30-
github.com/weaveworks/common v0.0.0-20211015155308-ebe5bdc2c89e
31-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
32-
google.golang.org/api v0.74.0
24+
github.com/prometheus/client_golang v1.13.0
25+
github.com/prometheus/common v0.37.0
26+
github.com/prometheus/prometheus v0.39.1
27+
github.com/sirupsen/logrus v1.9.0
28+
github.com/stretchr/testify v1.8.0
29+
github.com/thanos-io/objstore v0.0.0-20221006135717-79dcec7fe604
30+
github.com/thanos-io/thanos v0.29.1-0.20221115064008-fe45cfc66b7d
31+
github.com/weaveworks/common v0.0.0-20220706100410-67d27ed40fae
32+
golang.org/x/sync v0.0.0-20220907140024-f12130a52804
33+
google.golang.org/api v0.97.0
3334
gopkg.in/alecthomas/kingpin.v2 v2.2.6
3435
gopkg.in/yaml.v2 v2.4.0
35-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
36+
gopkg.in/yaml.v3 v3.0.1
3637
gotest.tools v2.2.0+incompatible
3738
)
3839

3940
require (
40-
cloud.google.com/go v0.100.2 // indirect
41-
cloud.google.com/go/compute v1.5.0 // indirect
41+
cloud.google.com/go v0.104.0 // indirect
42+
cloud.google.com/go/compute v1.7.0 // indirect
4243
cloud.google.com/go/iam v0.3.0 // indirect
43-
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
44-
github.com/Azure/azure-storage-blob-go v0.13.0 // indirect
45-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
46-
github.com/Azure/go-autorest/autorest v0.11.25 // indirect
47-
github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
48-
github.com/Azure/go-autorest/autorest/azure/auth v0.5.8 // indirect
49-
github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
50-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
51-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
52-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
44+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0 // indirect
45+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 // indirect
46+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect
47+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1 // indirect
48+
github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 // indirect
5349
github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
5450
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
55-
github.com/armon/go-metrics v0.3.9 // indirect
56-
github.com/aws/aws-sdk-go v1.43.31 // indirect
51+
github.com/armon/go-metrics v0.4.0 // indirect
52+
github.com/aws/aws-sdk-go v1.44.109 // indirect
53+
github.com/aws/aws-sdk-go-v2 v1.16.0 // indirect
54+
github.com/aws/aws-sdk-go-v2/config v1.15.1 // indirect
55+
github.com/aws/aws-sdk-go-v2/credentials v1.11.0 // indirect
56+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.1 // indirect
57+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.7 // indirect
58+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.1 // indirect
59+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.8 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.1 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.1 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/sts v1.16.1 // indirect
63+
github.com/aws/smithy-go v1.11.1 // indirect
5764
github.com/beorn7/perks v1.0.1 // indirect
5865
github.com/blang/semver/v4 v4.0.0 // indirect
5966
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
@@ -65,20 +72,21 @@ require (
6572
github.com/davecgh/go-spew v1.1.1 // indirect
6673
github.com/dennwc/varint v1.0.0 // indirect
6774
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
68-
github.com/dimchansky/utfbom v1.1.1 // indirect
6975
github.com/dlclark/regexp2 v1.2.0 // indirect
76+
github.com/dustin/go-humanize v1.0.0 // indirect
7077
github.com/edsrzf/mmap-go v1.1.0 // indirect
78+
github.com/efficientgo/tools/core v0.0.0-20220817170617-6c25e3b627dd // indirect
7179
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
7280
github.com/fatih/color v1.13.0 // indirect
73-
github.com/felixge/httpsnoop v1.0.2 // indirect
74-
github.com/fsnotify/fsnotify v1.5.1 // indirect
81+
github.com/felixge/httpsnoop v1.0.3 // indirect
82+
github.com/fsnotify/fsnotify v1.5.4 // indirect
7583
github.com/go-logfmt/logfmt v0.5.1 // indirect
7684
github.com/go-logr/logr v1.2.3 // indirect
7785
github.com/go-logr/stdr v1.2.2 // indirect
78-
github.com/go-redis/redis/v8 v8.11.4 // indirect
86+
github.com/go-redis/redis/v8 v8.11.5 // indirect
7987
github.com/gogo/googleapis v1.4.0 // indirect
80-
github.com/gogo/status v1.1.0 // indirect
81-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
88+
github.com/gogo/status v1.1.1 // indirect
89+
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
8290
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8391
github.com/golang/protobuf v1.5.2 // indirect
8492
github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac // indirect
@@ -88,15 +96,16 @@ require (
8896
github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9 // indirect
8997
github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9 // indirect
9098
github.com/google/btree v1.0.1 // indirect
91-
github.com/google/go-cmp v0.5.7 // indirect
92-
github.com/google/go-querystring v1.0.0 // indirect
93-
github.com/google/uuid v1.2.0 // indirect
94-
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
99+
github.com/google/go-cmp v0.5.9 // indirect
100+
github.com/google/go-querystring v1.1.0 // indirect
101+
github.com/google/uuid v1.3.0 // indirect
102+
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
103+
github.com/googleapis/gax-go/v2 v2.5.1 // indirect
95104
github.com/gosimple/slug v1.1.1 // indirect
96-
github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2 // indirect
105+
github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 // indirect
97106
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
98107
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
99-
github.com/hashicorp/consul/api v1.12.0 // indirect
108+
github.com/hashicorp/consul/api v1.15.2 // indirect
100109
github.com/hashicorp/errwrap v1.1.0 // indirect
101110
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
102111
github.com/hashicorp/go-hclog v0.16.2 // indirect
@@ -107,90 +116,103 @@ require (
107116
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
108117
github.com/hashicorp/golang-lru v0.5.4 // indirect
109118
github.com/hashicorp/memberlist v0.3.1 // indirect
110-
github.com/hashicorp/serf v0.9.6 // indirect
119+
github.com/hashicorp/serf v0.9.7 // indirect
111120
github.com/jmespath/go-jmespath v0.4.0 // indirect
112121
github.com/jpillora/backoff v1.0.0 // indirect
113122
github.com/json-iterator/go v1.1.12 // indirect
114-
github.com/klauspost/cpuid v1.3.1 // indirect
123+
github.com/julienschmidt/httprouter v1.3.0 // indirect
124+
github.com/klauspost/compress v1.15.9 // indirect
125+
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
126+
github.com/kylelemons/godebug v1.1.0 // indirect
115127
github.com/mattn/go-colorable v0.1.12 // indirect
116-
github.com/mattn/go-ieproxy v0.0.1 // indirect
117128
github.com/mattn/go-isatty v0.0.14 // indirect
118-
github.com/miekg/dns v1.1.48 // indirect
119-
github.com/minio/md5-simd v1.1.0 // indirect
120-
github.com/minio/minio-go/v7 v7.0.10 // indirect
121-
github.com/minio/sha256-simd v0.1.1 // indirect
129+
github.com/miekg/dns v1.1.50 // indirect
130+
github.com/minio/md5-simd v1.1.2 // indirect
131+
github.com/minio/minio-go/v7 v7.0.37 // indirect
132+
github.com/minio/sha256-simd v1.0.0 // indirect
122133
github.com/mitchellh/go-homedir v1.1.0 // indirect
123-
github.com/mitchellh/mapstructure v1.4.3 // indirect
134+
github.com/mitchellh/mapstructure v1.5.0 // indirect
124135
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
125136
github.com/modern-go/reflect2 v1.0.2 // indirect
126137
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
127-
github.com/ncw/swift v1.0.52 // indirect
138+
github.com/ncw/swift v1.0.53 // indirect
128139
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect
129140
github.com/opentracing/opentracing-go v1.2.0 // indirect
130-
github.com/pmezard/go-difflib v1.0.0 // indirect
141+
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
142+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
131143
github.com/prometheus/client_model v0.2.0 // indirect
132144
github.com/prometheus/common/sigv4 v0.1.0 // indirect
133-
github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 // indirect
134-
github.com/prometheus/procfs v0.7.3 // indirect
145+
github.com/prometheus/exporter-toolkit v0.7.1 // indirect
146+
github.com/prometheus/procfs v0.8.0 // indirect
135147
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
136-
github.com/rs/xid v1.2.1 // indirect
148+
github.com/rs/xid v1.4.0 // indirect
137149
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
138150
github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
139151
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
140152
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
141-
github.com/stretchr/objx v0.2.0 // indirect
142-
github.com/uber/jaeger-client-go v2.29.1+incompatible // indirect
153+
github.com/stretchr/objx v0.4.0 // indirect
154+
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
143155
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
156+
github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a // indirect
144157
github.com/weaveworks/promrus v1.2.0 // indirect
145158
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
146159
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
147160
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
148161
go.opencensus.io v0.23.0 // indirect
149-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 // indirect
150-
go.opentelemetry.io/otel v1.6.1 // indirect
151-
go.opentelemetry.io/otel/metric v0.28.0 // indirect
152-
go.opentelemetry.io/otel/trace v1.6.1 // indirect
153-
go.uber.org/atomic v1.9.0 // indirect
154-
go.uber.org/goleak v1.1.12 // indirect
155-
go.uber.org/multierr v1.7.0 // indirect
156-
go.uber.org/zap v1.19.1 // indirect
157-
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
158-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
159-
golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
160-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
161-
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect
162+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect
163+
go.opentelemetry.io/contrib/propagators/autoprop v0.34.0 // indirect
164+
go.opentelemetry.io/contrib/propagators/aws v1.9.0 // indirect
165+
go.opentelemetry.io/contrib/propagators/b3 v1.9.0 // indirect
166+
go.opentelemetry.io/contrib/propagators/jaeger v1.9.0 // indirect
167+
go.opentelemetry.io/contrib/propagators/ot v1.9.0 // indirect
168+
go.opentelemetry.io/otel v1.11.0 // indirect
169+
go.opentelemetry.io/otel/bridge/opentracing v1.11.1-0.20221013154440-84e28fd3bdb1 // indirect
170+
go.opentelemetry.io/otel/metric v0.32.0 // indirect
171+
go.opentelemetry.io/otel/sdk v1.11.0 // indirect
172+
go.opentelemetry.io/otel/trace v1.11.0 // indirect
173+
go.uber.org/atomic v1.10.0 // indirect
174+
go.uber.org/goleak v1.2.0 // indirect
175+
go.uber.org/multierr v1.8.0 // indirect
176+
go.uber.org/zap v1.21.0 // indirect
177+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
178+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
179+
golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9 // indirect
180+
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
181+
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
162182
golang.org/x/text v0.3.7 // indirect
163-
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
164-
golang.org/x/tools v0.1.10 // indirect
165-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
183+
golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45 // indirect
184+
golang.org/x/tools v0.1.12 // indirect
185+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
166186
google.golang.org/appengine v1.6.7 // indirect
167-
google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb // indirect
168-
google.golang.org/grpc v1.45.0 // indirect
169-
google.golang.org/protobuf v1.28.0 // indirect
170-
gopkg.in/ini.v1 v1.57.0 // indirect
187+
google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006 // indirect
188+
google.golang.org/grpc v1.49.0 // indirect
189+
google.golang.org/protobuf v1.28.1 // indirect
190+
gopkg.in/ini.v1 v1.66.6 // indirect
171191
)
172192

173-
// Cortex Overrides
193+
// Override since git.apache.org is down. The docs say to fetch from github.
174194
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
175195

176-
replace github.com/thanos-io/thanos v0.22.0 => github.com/thanos-io/thanos v0.19.1-0.20211208205607-d1acaea2a11a
177-
178-
// Thanos Override
179-
replace github.com/efficientgo/tools/core => github.com/efficientgo/tools/core v0.0.0-20210731122119-5d4a0645ce9a
180-
181-
// Keeping this same as Cortex to avoid dependency issues.
182-
replace k8s.io/client-go => k8s.io/client-go v0.21.3
183-
184-
replace k8s.io/api => k8s.io/api v0.21.3
185-
186196
// Use fork of gocql that has gokit logs and Prometheus metrics.
187197
replace github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
188198

189199
// Using a 3rd-party branch for custom dialer - see https://github.com/bradfitz/gomemcache/pull/86
190200
replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab
191201

192-
// Required for Alertmanager
202+
// Replace memberlist with Grafana's fork which includes some fixes that haven't been merged upstream yet
203+
replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.2.5-0.20211201083710-c7bc8e9df94b
204+
205+
// Replace grpc as weaveworks common needs to update this first
206+
// vendor/github.com/weaveworks/common/httpgrpc/server/server.go:137:3: undefined: grpc.WithBalancerName
207+
replace google.golang.org/grpc => google.golang.org/grpc v1.45.0
208+
209+
// Same version being used by thanos
210+
replace github.com/vimeo/galaxycache => github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e
211+
212+
// v0.20.5 caused go mod checksum error
213+
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.20.6
193214

194-
replace github.com/hashicorp/consul => github.com/hashicorp/consul v1.8.1
215+
// the v6.0.5851 Prometheus depends on doesn't seem to exist anymore?
216+
replace github.com/ionos-cloud/sdk-go/v6 => github.com/ionos-cloud/sdk-go/v6 v6.0.4
195217

196-
replace github.com/grafana-tools/sdk => github.com/colega/grafana-tools-sdk v0.0.0-20220323154849-711bca56d13f
218+
replace github.com/googleapis/gnostic => github.com/google/gnostic v0.6.9

0 commit comments

Comments
 (0)