Skip to content

Commit

Permalink
Vendor mimir-prometheus (#7624)
Browse files Browse the repository at this point in the history
Vendor mimir-prometheus to bring in changes from grafana/mimir-prometheus#606.
  • Loading branch information
jhalterman authored Mar 14, 2024
1 parent be893e7 commit 9d6f6d5
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* [ENHANCEMENT] Store-gateway: merge series from different blocks concurrently. #7456
* [BUGFIX] Rules: improve error handling when querier is local to the ruler. #7567
* [BUGFIX] Querier, store-gateway: Protect against panics raised during snappy encoding. #7520
* [BUGFIX] Ingester: Prevent timely compaction of empty blocks. #7624

### Mixin
* [ENHANCEMENT] Alerts: allow configuring alerts range interval via `_config.base_alerts_range_interval_minutes`. #7591
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ require (
)

// Using a fork of Prometheus with Mimir-specific changes.
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240312132807-2b3d9c010123
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240313234931-e6a693368666

// 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
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 h1:X8IKQ0wu40wp
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56/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-20240312132807-2b3d9c010123 h1:c7NWKTQF9HR8992gNWK7gDk6GXMMPycbnfnwe6d+nNE=
github.com/grafana/mimir-prometheus v0.0.0-20240312132807-2b3d9c010123/go.mod h1:8ChS3ZH+BHOQvOHdBQJykzvuCcPyCPkCSxEGtOOoQU0=
github.com/grafana/mimir-prometheus v0.0.0-20240313234931-e6a693368666 h1:THc8D7WDsyy6wAlTdDmkKT+eIkrRlk3oB1aLTaxnpkg=
github.com/grafana/mimir-prometheus v0.0.0-20240313234931-e6a693368666/go.mod h1:8ChS3ZH+BHOQvOHdBQJykzvuCcPyCPkCSxEGtOOoQU0=
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/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
Expand Down
22 changes: 16 additions & 6 deletions vendor/github.com/prometheus/prometheus/tsdb/head.go

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

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

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

0 comments on commit 9d6f6d5

Please sign in to comment.