Skip to content

Commit 498635f

Browse files
alanprotalanprot
authored
Chore: Update Prometheus (#5841)
* update prometheus Signed-off-by: alanprot <[email protected]> * fix breaking changes Signed-off-by: alanprot <[email protected]> * fix breaking changes Signed-off-by: alanprot <[email protected]> * update doc Signed-off-by: alanprot <[email protected]> * changelog Signed-off-by: alanprot <[email protected]> * not allow to configure AM experimental features Signed-off-by: alanprot <[email protected]> * remove v1 AM apis test Signed-off-by: alanprot <[email protected]> * update changelog Signed-off-by: alanprot <[email protected]> * Deprecate ruler.alertmanager-use-v2 flag Signed-off-by: alanprot <[email protected]> * fixing more tests Signed-off-by: alanprot <[email protected]> --------- Signed-off-by: alanprot <[email protected]>
1 parent 20377e0 commit 498635f

File tree

471 files changed

+13686
-10212
lines changed

Some content is hidden

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

471 files changed

+13686
-10212
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* [CHANGE] Ruler: Remove `cortex_ruler_write_requests_total`, `cortex_ruler_write_requests_failed_total`, `cortex_ruler_queries_total`, `cortex_ruler_queries_failed_total`, and `cortex_ruler_query_seconds_total` metrics for the tenant when the ruler deletes the manager for the tenant. #5772
1010
* [CHANGE] Main: Mark `mem-ballast-size-bytes` flag as deprecated. #5816
1111
* [CHANGE] Querier: Mark `-querier.ingester-streaming` flag as deprecated. Now query ingester streaming is always enabled. #5817
12+
* [CHANGE] AlertManager API: Removal of all api/v1/ endpoints following [2970](https://github.com/prometheus/alertmanager/pull/2970). [5841]
1213
* [FEATURE] Ingester: Add per-tenant new metric `cortex_ingester_tsdb_data_replay_duration_seconds`. #5477
1314
* [FEATURE] Query Frontend/Scheduler: Add query priority support. #5605
1415
* [FEATURE] Tracing: Add `kuberesolver` to resolve endpoints address with `kubernetes://` prefix as Kubernetes service. #5731

‎cmd/cortex/main.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/go-kit/log/level"
1717
"github.com/pkg/errors"
1818
"github.com/prometheus/client_golang/prometheus"
19+
collectorversion "github.com/prometheus/client_golang/prometheus/collectors/version"
1920
"github.com/prometheus/common/version"
2021
"gopkg.in/yaml.v2"
2122

@@ -46,7 +47,7 @@ func init() {
4647
version.Version = Version
4748
version.Branch = Branch
4849
version.Revision = Revision
49-
prometheus.MustRegister(version.NewCollector("cortex"))
50+
prometheus.MustRegister(collectorversion.NewCollector("cortex"))
5051
prometheus.MustRegister(configHash)
5152
}
5253

‎docs/configuration/config-file-reference.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4079,10 +4079,6 @@ ruler_client:
40794079
# CLI flag: -ruler.alertmanager-refresh-interval
40804080
[alertmanager_refresh_interval: <duration> | default = 1m]
40814081
4082-
# If enabled requests to Alertmanager will utilize the V2 API.
4083-
# CLI flag: -ruler.alertmanager-use-v2
4084-
[enable_alertmanager_v2: <boolean> | default = false]
4085-
40864082
# Capacity of the queue for notifications to be sent to the Alertmanager.
40874083
# CLI flag: -ruler.notification-queue-capacity
40884084
[notification_queue_capacity: <int> | default = 10000]

‎go.mod‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
88
github.com/alicebob/miniredis/v2 v2.32.1
99
github.com/armon/go-metrics v0.4.1
10-
github.com/aws/aws-sdk-go v1.50.25
10+
github.com/aws/aws-sdk-go v1.50.32
1111
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
1212
github.com/cespare/xxhash v1.1.0
1313
github.com/cortexproject/promqlsmith v0.0.0-20240328172224-5e341f0dd08e
@@ -16,23 +16,23 @@ require (
1616
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
1717
github.com/felixge/fgprof v0.9.3
1818
github.com/go-kit/log v0.2.1
19-
github.com/go-openapi/strfmt v0.22.0
19+
github.com/go-openapi/strfmt v0.22.2
2020
github.com/go-openapi/swag v0.22.9
2121
github.com/go-redis/redis/v8 v8.11.5
2222
github.com/gogo/protobuf v1.3.2
2323
github.com/gogo/status v1.1.1
2424
github.com/golang-migrate/migrate/v4 v4.17.0
25-
github.com/golang/protobuf v1.5.3
25+
github.com/golang/protobuf v1.5.4
2626
github.com/golang/snappy v0.0.4
2727
github.com/gorilla/mux v1.8.1
2828
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd
2929
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
30-
github.com/hashicorp/consul/api v1.27.0
30+
github.com/hashicorp/consul/api v1.28.2
3131
github.com/hashicorp/go-cleanhttp v0.5.2
3232
github.com/hashicorp/go-sockaddr v1.0.6
3333
github.com/hashicorp/memberlist v0.5.0
3434
github.com/json-iterator/go v1.1.12
35-
github.com/klauspost/compress v1.17.6
35+
github.com/klauspost/compress v1.17.7
3636
github.com/lib/pq v1.10.9
3737
github.com/minio/minio-go/v7 v7.0.69
3838
github.com/mitchellh/go-wordwrap v1.0.1
@@ -41,36 +41,36 @@ require (
4141
github.com/opentracing-contrib/go-stdlib v1.0.0
4242
github.com/opentracing/opentracing-go v1.2.0
4343
github.com/pkg/errors v0.9.1
44-
github.com/prometheus/alertmanager v0.26.0
45-
github.com/prometheus/client_golang v1.18.0
46-
github.com/prometheus/client_model v0.5.0
47-
github.com/prometheus/common v0.47.0
44+
github.com/prometheus/alertmanager v0.27.0
45+
github.com/prometheus/client_golang v1.19.0
46+
github.com/prometheus/client_model v0.6.0
47+
github.com/prometheus/common v0.49.1-0.20240306132007-4199f18c3e92
4848
// Prometheus maps version 2.x.y to tags v0.x.y.
49-
github.com/prometheus/prometheus v0.50.2-0.20240229164915-d5f0a240faad
49+
github.com/prometheus/prometheus v0.51.1-0.20240328124728-d81e41d58ec8
5050
github.com/segmentio/fasthash v1.0.3
5151
github.com/sony/gobreaker v0.5.0
5252
github.com/spf13/afero v1.11.0
53-
github.com/stretchr/testify v1.8.4
53+
github.com/stretchr/testify v1.9.0
5454
github.com/thanos-io/objstore v0.0.0-20240309075357-e8336a5fd5f3
55-
github.com/thanos-io/promql-engine v0.0.0-20240318110350-23714ea2522d
56-
github.com/thanos-io/thanos v0.34.2-0.20240327180044-4d7a75f40ae1
55+
github.com/thanos-io/promql-engine v0.0.0-20240327143517-c5e4b2e6ef02
56+
github.com/thanos-io/thanos v0.34.2-0.20240328185924-943401f726ed
5757
github.com/uber/jaeger-client-go v2.30.0+incompatible
5858
github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
5959
go.etcd.io/etcd/api/v3 v3.5.12
6060
go.etcd.io/etcd/client/pkg/v3 v3.5.12
6161
go.etcd.io/etcd/client/v3 v3.5.12
6262
go.opentelemetry.io/contrib/propagators/aws v1.22.0
63-
go.opentelemetry.io/otel v1.22.0
63+
go.opentelemetry.io/otel v1.24.0
6464
go.opentelemetry.io/otel/bridge/opentracing v1.22.0
65-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0
66-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0
67-
go.opentelemetry.io/otel/sdk v1.22.0
68-
go.opentelemetry.io/otel/trace v1.22.0
65+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
66+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
67+
go.opentelemetry.io/otel/sdk v1.24.0
68+
go.opentelemetry.io/otel/trace v1.24.0
6969
go.uber.org/atomic v1.11.0
70-
golang.org/x/net v0.21.0
70+
golang.org/x/net v0.22.0
7171
golang.org/x/sync v0.6.0
7272
golang.org/x/time v0.5.0
73-
google.golang.org/grpc v1.61.0
73+
google.golang.org/grpc v1.62.1
7474
gopkg.in/yaml.v2 v2.4.0
7575
gopkg.in/yaml.v3 v3.0.1
7676
)
@@ -86,12 +86,12 @@ require (
8686
)
8787

8888
require (
89-
cloud.google.com/go v0.111.0 // indirect
90-
cloud.google.com/go/compute v1.23.3 // indirect
89+
cloud.google.com/go v0.112.0 // indirect
90+
cloud.google.com/go/compute v1.23.4 // indirect
9191
cloud.google.com/go/compute/metadata v0.2.3 // indirect
92-
cloud.google.com/go/iam v1.1.5 // indirect
93-
cloud.google.com/go/storage v1.35.1 // indirect
94-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 // indirect
92+
cloud.google.com/go/iam v1.1.6 // indirect
93+
cloud.google.com/go/storage v1.36.0 // indirect
94+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
9595
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
9696
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
9797
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0 // indirect
@@ -131,25 +131,25 @@ require (
131131
github.com/go-logr/logr v1.4.1 // indirect
132132
github.com/go-logr/stdr v1.2.2 // indirect
133133
github.com/go-openapi/analysis v0.22.2 // indirect
134-
github.com/go-openapi/errors v0.21.0 // indirect
134+
github.com/go-openapi/errors v0.21.1 // indirect
135135
github.com/go-openapi/jsonpointer v0.20.2 // indirect
136136
github.com/go-openapi/jsonreference v0.20.4 // indirect
137137
github.com/go-openapi/loads v0.21.5 // indirect
138138
github.com/go-openapi/runtime v0.27.1 // indirect
139139
github.com/go-openapi/spec v0.20.14 // indirect
140-
github.com/go-openapi/validate v0.22.6 // indirect
140+
github.com/go-openapi/validate v0.23.0 // indirect
141141
github.com/gofrs/uuid v4.4.0+incompatible // indirect
142142
github.com/gogo/googleapis v1.4.0 // indirect
143143
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
144144
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
145145
github.com/google/btree v1.0.1 // indirect
146-
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 // indirect
146+
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
147147
github.com/google/s2a-go v0.1.7 // indirect
148148
github.com/google/uuid v1.6.0 // indirect
149149
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
150-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
150+
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
151151
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
152-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
152+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
153153
github.com/hashicorp/errwrap v1.1.0 // indirect
154154
github.com/hashicorp/go-hclog v1.5.0 // indirect
155155
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -158,7 +158,7 @@ require (
158158
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
159159
github.com/hashicorp/go-version v1.6.0 // indirect
160160
github.com/hashicorp/golang-lru v0.6.0 // indirect
161-
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
161+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
162162
github.com/hashicorp/serf v0.10.1 // indirect
163163
github.com/jessevdk/go-flags v1.5.0 // indirect
164164
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -192,54 +192,54 @@ require (
192192
github.com/prometheus/exporter-toolkit v0.11.0 // indirect
193193
github.com/prometheus/procfs v0.12.0 // indirect
194194
github.com/redis/rueidis v1.0.14-go1.18 // indirect
195-
github.com/rs/cors v1.9.0 // indirect
195+
github.com/rs/cors v1.10.1 // indirect
196196
github.com/rs/xid v1.5.0 // indirect
197197
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
198198
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
199199
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
200200
github.com/sirupsen/logrus v1.9.3 // indirect
201201
github.com/soheilhy/cmux v0.1.5 // indirect
202-
github.com/stretchr/objx v0.5.0 // indirect
202+
github.com/stretchr/objx v0.5.2 // indirect
203203
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
204204
github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a // indirect
205205
github.com/weaveworks/promrus v1.2.0 // indirect
206206
github.com/yuin/gopher-lua v1.1.1 // indirect
207207
github.com/zhangyunhao116/umap v0.0.0-20221211160557-cb7705fafa39 // indirect
208-
go.mongodb.org/mongo-driver v1.13.1 // indirect
208+
go.mongodb.org/mongo-driver v1.14.0 // indirect
209209
go.opencensus.io v0.24.0 // indirect
210-
go.opentelemetry.io/collector/featuregate v1.0.1 // indirect
211-
go.opentelemetry.io/collector/pdata v1.0.1 // indirect
212-
go.opentelemetry.io/collector/semconv v0.93.0 // indirect
213-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
214-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
210+
go.opentelemetry.io/collector/featuregate v1.3.0 // indirect
211+
go.opentelemetry.io/collector/pdata v1.3.0 // indirect
212+
go.opentelemetry.io/collector/semconv v0.96.0 // indirect
213+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
214+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
215215
go.opentelemetry.io/contrib/propagators/autoprop v0.38.0 // indirect
216216
go.opentelemetry.io/contrib/propagators/b3 v1.13.0 // indirect
217217
go.opentelemetry.io/contrib/propagators/jaeger v1.13.0 // indirect
218218
go.opentelemetry.io/contrib/propagators/ot v1.13.0 // indirect
219-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
220-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
219+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
220+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
221221
go.uber.org/goleak v1.3.0 // indirect
222222
go.uber.org/multierr v1.11.0 // indirect
223223
go.uber.org/zap v1.21.0 // indirect
224224
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
225225
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
226-
golang.org/x/crypto v0.19.0 // indirect
227-
golang.org/x/mod v0.14.0 // indirect
228-
golang.org/x/oauth2 v0.16.0 // indirect
229-
golang.org/x/sys v0.17.0 // indirect
226+
golang.org/x/crypto v0.21.0 // indirect
227+
golang.org/x/mod v0.16.0 // indirect
228+
golang.org/x/oauth2 v0.18.0 // indirect
229+
golang.org/x/sys v0.18.0 // indirect
230230
golang.org/x/text v0.14.0 // indirect
231-
golang.org/x/tools v0.17.0 // indirect
231+
golang.org/x/tools v0.19.0 // indirect
232232
gonum.org/v1/gonum v0.12.0 // indirect
233-
google.golang.org/api v0.157.0 // indirect
233+
google.golang.org/api v0.168.0 // indirect
234234
google.golang.org/appengine v1.6.8 // indirect
235-
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
236-
google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect
237-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
235+
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
236+
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
237+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect
238238
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
239239
gopkg.in/ini.v1 v1.67.0 // indirect
240-
gopkg.in/telebot.v3 v3.1.3 // indirect
241-
k8s.io/apimachinery v0.29.2 // indirect
242-
k8s.io/client-go v0.29.2 // indirect
240+
gopkg.in/telebot.v3 v3.2.1 // indirect
241+
k8s.io/apimachinery v0.29.3 // indirect
242+
k8s.io/client-go v0.29.3 // indirect
243243
k8s.io/klog/v2 v2.120.1 // indirect
244244
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
245245
)

0 commit comments

Comments
 (0)