Skip to content

Commit

Permalink
Vendor update mimir-prometheus (#6579)
Browse files Browse the repository at this point in the history 
For grafana/mimir-prometheus#562
revert of grafana/mimir-prometheus#549

Ref: #incident-2023-11-06-cortex-ops-01-block-to-the-future

Signed-off-by: György Krajcsovits <[email protected]>
(cherry picked from commit 4987dd5)
  • Loading branch information
@krajorama @grafanabot
krajorama authored and grafanabot committed Nov 6, 2023
1 parent 2dbe45e commit e28734e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ require (
)

// Using a fork of Prometheus with Mimir-specific changes.
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20231103061820-790cede0a18a
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20231106160916-237a77b48340

// Replace memberlist with our fork which includes some fixes that haven't been
// merged upstream yet:
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,8 @@ github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 h1:/of8Z8taCPft
github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU=
github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU=
github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
github.com/grafana/mimir-prometheus v0.0.0-20231103061820-790cede0a18a h1:ig5QuR9D4HFbexx0Tbfkx3Z3nlxCZ7JaAh+HxC++AVk=
github.com/grafana/mimir-prometheus v0.0.0-20231103061820-790cede0a18a/go.mod h1:VIbTjmxRZbB1CvLd3TRKcrXU62bXesG4P24dmcugLbY=
github.com/grafana/mimir-prometheus v0.0.0-20231106160916-237a77b48340 h1:fVwUQ/DflEdP0CRqMmrV9e06rS7YWPCCX0QQsxHtl0A=
github.com/grafana/mimir-prometheus v0.0.0-20231106160916-237a77b48340/go.mod h1:VIbTjmxRZbB1CvLd3TRKcrXU62bXesG4P24dmcugLbY=
github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956 h1:em1oddjXL8c1tL0iFdtVtPloq2hRPen2MJQKoAWpxu0=
github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 h1:A3dhViTeFDSQcGOXuUi6ukCQSMyDtDISBp2z6OOo2YM=
Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/prometheus/prometheus/storage/merge.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e28734e

Please sign in to comment.