Skip to content

Commit 89dcbb2

Browse files
bborehamgrafanabot
authored andcommitted
Update mimir-prometheus to revert MemPostings issue (#9829)
Signed-off-by: Bryan Boreham <[email protected]> (cherry picked from commit 758fbf2)
1 parent c72946f commit 89dcbb2

File tree

5 files changed

+13
-25
lines changed

5 files changed

+13
-25
lines changed

CHANGELOG.md

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
* [BUGFIX] Fix issue when using the experimental `-ruler.max-independent-rule-evaluation-concurrency` feature, where the ruler could panic as it updates a running ruleset or shutdowns. #9726
6565
* [BUGFIX] Ingester: Fix race condition in per-tenant TSDB creation. #9708
6666
* [BUGFIX] Ingester: Fix race condition in exemplar adding. #9765
67-
* [BUGFIX] Ingester: Fix race condition in series adding. #9765
6867
* [BUGFIX] Ingester: Fix race condition in native histogram appending. #9765
6968

7069
### Mixin

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ require (
282282
)
283283

284284
// Using a fork of Prometheus with Mimir-specific changes.
285-
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241104085513-57e1ca2a6f61
285+
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241104175756-dea6247a158f
286286

287287
// Replace memberlist with our fork which includes some fixes that haven't been
288288
// merged upstream yet:

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1270,8 +1270,8 @@ github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40 h1:1TeKhyS+pvzO
12701270
github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40/go.mod h1:IGRj8oOoxwJbHBYl1+OhS9UjQR0dv6SQOep7HqmtyFU=
12711271
github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU=
12721272
github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
1273-
github.com/grafana/mimir-prometheus v0.0.0-20241104085513-57e1ca2a6f61 h1:5iLgPt4mT0zZoe3N+y4Dw8IAvxJwTl0eIlUS8q0iGg0=
1274-
github.com/grafana/mimir-prometheus v0.0.0-20241104085513-57e1ca2a6f61/go.mod h1:7SuFBLahBoRY7KcgzWzK0p1n5QL+5dyr/Ysat6v1378=
1273+
github.com/grafana/mimir-prometheus v0.0.0-20241104175756-dea6247a158f h1:/0K7ExuyP5pS/AUqibuJi6ATxEaZG6/2wcAbWMvw8D4=
1274+
github.com/grafana/mimir-prometheus v0.0.0-20241104175756-dea6247a158f/go.mod h1:7SuFBLahBoRY7KcgzWzK0p1n5QL+5dyr/Ysat6v1378=
12751275
github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956 h1:em1oddjXL8c1tL0iFdtVtPloq2hRPen2MJQKoAWpxu0=
12761276
github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
12771277
github.com/grafana/prometheus-alertmanager v0.25.1-0.20240930132144-b5e64e81e8d3 h1:6D2gGAwyQBElSrp3E+9lSr7k8gLuP3Aiy20rweLWeBw=

vendor/github.com/prometheus/prometheus/tsdb/index/postings.go

+8-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)