Skip to content

Commit ee7ffb7

Browse files
chore(deps): remove obsolete prometheus replace directive (grafana#96925)
* chore(deps): remove obsolete prometheus replace directive Signed-off-by: Dave Henderson <[email protected]> * chore: Replace newly-deprecated call Signed-off-by: Dave Henderson <[email protected]> --------- Signed-off-by: Dave Henderson <[email protected]>
1 parent bf8524e commit ee7ffb7

File tree

13 files changed

+3140
-1928
lines changed

13 files changed

+3140
-1928
lines changed

apps/alerting/notifications/go.mod

+8-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ module github.com/grafana/grafana/apps/alerting/notifications
22

33
go 1.23.1
44

5+
replace github.com/grafana/grafana => ../../..
6+
57
require (
8+
github.com/grafana/grafana v0.0.0-00010101000000-000000000000
69
github.com/grafana/grafana-app-sdk v0.23.1
710
k8s.io/apimachinery v0.32.0
811
k8s.io/apiserver v0.32.0
@@ -12,8 +15,10 @@ require (
1215
require (
1316
github.com/beorn7/perks v1.0.1 // indirect
1417
github.com/blang/semver/v4 v4.0.0 // indirect
18+
github.com/bwmarrin/snowflake v0.3.0 // indirect
1519
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
1620
github.com/cespare/xxhash/v2 v2.3.0 // indirect
21+
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
1722
github.com/coreos/go-semver v0.3.1 // indirect
1823
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
1924
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -26,18 +31,16 @@ require (
2631
github.com/go-openapi/jsonreference v0.21.0 // indirect
2732
github.com/go-openapi/swag v0.23.0 // indirect
2833
github.com/gogo/protobuf v1.3.2 // indirect
29-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
3034
github.com/golang/protobuf v1.5.4 // indirect
31-
github.com/google/btree v1.1.2 // indirect
3235
github.com/google/gnostic-models v0.6.8 // indirect
3336
github.com/google/go-cmp v0.6.0 // indirect
3437
github.com/google/gofuzz v1.2.0 // indirect
3538
github.com/google/uuid v1.6.0 // indirect
36-
github.com/gorilla/websocket v1.5.3 // indirect
37-
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
39+
github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da // indirect
3840
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
3941
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
4042
github.com/inconshreveable/mousetrap v1.1.0 // indirect
43+
github.com/jmespath-community/go-jmespath v1.1.1 // indirect
4144
github.com/josharian/intern v1.0.0 // indirect
4245
github.com/json-iterator/go v1.1.12 // indirect
4346
github.com/klauspost/compress v1.17.11 // indirect
@@ -70,14 +73,13 @@ require (
7073
go.uber.org/multierr v1.11.0 // indirect
7174
go.uber.org/zap v1.27.0 // indirect
7275
golang.org/x/crypto v0.32.0 // indirect
76+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
7377
golang.org/x/net v0.33.0 // indirect
7478
golang.org/x/oauth2 v0.24.0 // indirect
7579
golang.org/x/sys v0.29.0 // indirect
7680
golang.org/x/term v0.28.0 // indirect
7781
golang.org/x/text v0.21.0 // indirect
7882
golang.org/x/time v0.7.0 // indirect
79-
golang.org/x/tools v0.28.0 // indirect
80-
google.golang.org/genproto v0.0.0-20240820151423-278611b39280 // indirect
8183
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
8284
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
8385
google.golang.org/grpc v1.69.2 // indirect

apps/alerting/notifications/go.sum

+194
Large diffs are not rendered by default.

go.mod

+14-9
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ go 1.23.1
55
// contains openapi encoder fixes. remove ASAP
66
replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code
77

8-
// Override Prometheus version because Prometheus v2.X is tagged as v0.X for Go modules purposes and Go assumes
9-
// that v1.Y is higher than v0.X, so when we resolve dependencies if any dependency imports v1.Y we'd
10-
// import that instead of v0.X even though v0.X is newer.
11-
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.52.0
12-
138
require (
149
buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling
1510
buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.34.2-20240902100956-02fd72488966.2 // @grafana/observability-traces-and-profiling
@@ -80,7 +75,7 @@ require (
8075
github.com/grafana/cuetsy v0.1.11 // @grafana/grafana-as-code
8176
github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
8277
github.com/grafana/dataplane/sdata v0.0.9 // @grafana/observability-metrics
83-
github.com/grafana/dskit v0.0.0-20240905221822-931a021fb06b // @grafana/grafana-backend-group
78+
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 // @grafana/grafana-backend-group
8479
github.com/grafana/gofpdf v0.0.0-20231002120153-857cc45be447 // @grafana/sharing-squad
8580
github.com/grafana/gomemcache v0.0.0-20240805133030-fdaf6a95408e // @grafana/grafana-operator-experience-squad
8681
github.com/grafana/grafana-app-sdk v0.23.1 // @grafana/grafana-app-platform-squad
@@ -141,7 +136,7 @@ require (
141136
github.com/prometheus/client_golang v1.20.5 // @grafana/alerting-backend
142137
github.com/prometheus/client_model v0.6.1 // @grafana/grafana-backend-group
143138
github.com/prometheus/common v0.61.0 // @grafana/alerting-backend
144-
github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3 // @grafana/alerting-backend
139+
github.com/prometheus/prometheus v0.54.0 // @grafana/alerting-backend
145140
github.com/redis/go-redis/v9 v9.1.0 // @grafana/alerting-backend
146141
github.com/robfig/cron/v3 v3.0.1 // @grafana/grafana-backend-group
147142
github.com/russellhaering/goxmldsig v1.4.0 // @grafana/grafana-backend-group
@@ -236,7 +231,6 @@ require (
236231
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
237232
github.com/axiomhq/hyperloglog v0.0.0-20240507144631-af9851f82b27 // indirect
238233
github.com/bahlo/generic-list-go v0.2.0 // indirect
239-
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
240234
github.com/beorn7/perks v1.0.1 // indirect
241235
github.com/bits-and-blooms/bitset v1.12.0 // indirect
242236
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
@@ -486,6 +480,7 @@ require (
486480
cel.dev/expr v0.18.0 // indirect
487481
cloud.google.com/go/longrunning v0.6.0 // indirect
488482
dario.cat/mergo v1.0.1 // indirect
483+
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
489484
github.com/at-wat/mqtt-go v0.19.4 // indirect
490485
github.com/blevesearch/bleve_index_api v1.1.12 // indirect
491486
github.com/blevesearch/geo v0.1.20 // indirect
@@ -502,6 +497,7 @@ require (
502497
github.com/blugelabs/ice/v2 v2.0.1 // indirect
503498
github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect
504499
github.com/cespare/xxhash v1.1.0 // indirect
500+
github.com/dave/jennifer v1.6.0 // indirect
505501
github.com/dolthub/maphash v0.1.0 // indirect
506502
github.com/emirpasic/gods v1.18.1 // indirect
507503
github.com/gammazero/deque v0.2.1 // indirect
@@ -513,6 +509,7 @@ require (
513509
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
514510
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
515511
github.com/hashicorp/serf v0.10.1 // indirect
512+
github.com/jtolds/gls v4.20.0+incompatible // indirect
516513
github.com/maypok86/otter v1.2.2 // indirect
517514
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect
518515
github.com/pires/go-proxyproto v0.7.0 // indirect
@@ -523,7 +520,6 @@ require (
523520
github.com/sony/gobreaker v0.5.0 // indirect
524521
go.etcd.io/bbolt v1.3.11 // indirect
525522
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
526-
go.opentelemetry.io/collector/featuregate v1.9.0 // indirect
527523
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect
528524
go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
529525
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -544,3 +540,12 @@ replace xorm.io/xorm => github.com/grafana/grafana/pkg/util/xorm v0.0.1
544540

545541
// lock for mysql tsdb compat
546542
replace github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.7.1
543+
544+
// v1.* versions were retracted, we need to stick with v0.*. This should work
545+
// without the exclude, but this otherwise gets pulled in as a transitive
546+
// dependency.
547+
exclude github.com/prometheus/prometheus v1.8.2-0.20221021121301-51a44e6657c3
548+
549+
// This was retracted, but seems to be known by the Go module proxy, and is
550+
// otherwise pulled in as a transitive dependency.
551+
exclude k8s.io/client-go v12.0.0+incompatible

0 commit comments

Comments
 (0)