Skip to content

Commit

Permalink
Update mimir-prom to add missing backports
Browse files Browse the repository at this point in the history 
This backports the following PRs:
- prometheus/prometheus#15426
- grafana/mimir-prometheus#751
- grafana/mimir-prometheus#763

Signed-off-by: Oleg Zaytsev <[email protected]>
  • Loading branch information
@colega
colega committed Nov 29, 2024
1 parent 3b24f13 commit 3895e1a
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 73 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ require (
)

// Using a fork of Prometheus with Mimir-specific changes.
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241120160701-db938c3ceac8
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241129155652-bcbf77399208

// 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 @@ -1276,8 +1276,8 @@ github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40 h1:1TeKhyS+pvzO
github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40/go.mod h1:IGRj8oOoxwJbHBYl1+OhS9UjQR0dv6SQOep7HqmtyFU=
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-20241120160701-db938c3ceac8 h1:y9kz0U/FgKalDnzS+2TbTdKytdvZrzqqX4eh3I26vZA=
github.com/grafana/mimir-prometheus v0.0.0-20241120160701-db938c3ceac8/go.mod h1:M4xmfU7SsnzjkLwJfvNen/MxAZp4DJPfipLzeib+0gQ=
github.com/grafana/mimir-prometheus v0.0.0-20241129155652-bcbf77399208 h1:DxbORcpCvHpnGkt29R6LnxN0o4NDknBOlumUiNEhQoE=
github.com/grafana/mimir-prometheus v0.0.0-20241129155652-bcbf77399208/go.mod h1:M4xmfU7SsnzjkLwJfvNen/MxAZp4DJPfipLzeib+0gQ=
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/prometheus-alertmanager v0.25.1-0.20240930132144-b5e64e81e8d3 h1:6D2gGAwyQBElSrp3E+9lSr7k8gLuP3Aiy20rweLWeBw=
Expand Down
33 changes: 30 additions & 3 deletions vendor/github.com/prometheus/prometheus/tsdb/db.go
View file

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

169 changes: 104 additions & 65 deletions vendor/github.com/prometheus/prometheus/tsdb/index/postings.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 3895e1a

Please sign in to comment.