Skip to content

Commit

Permalink
chore(deps): vendor update mimir-prometheus at 641277312a18 (#9668)
Browse files Browse the repository at this point in the history 
At grafana/mimir-prometheus@6412773
For prometheus/prometheus#15180

Signed-off-by: György Krajcsovits <[email protected]>
  • Loading branch information
@krajorama
krajorama authored Oct 18, 2024
1 parent 0d3f52f commit be8d96c
Show file tree
Hide file tree
Showing 5 changed files with 37 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 @@ -282,7 +282,7 @@ require (
)

// Using a fork of Prometheus with Mimir-specific changes.
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241018074748-fa72a3da0a0e
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241018090525-641277312a18

// 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 @@ -1270,8 +1270,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-20241018074748-fa72a3da0a0e h1:87oGdwPk/wX1N/ju5RG0CYmDVHW96D3E5OmdKQaRG/0=
github.com/grafana/mimir-prometheus v0.0.0-20241018074748-fa72a3da0a0e/go.mod h1:AvqWbZV+ePQxe3xQT4IX1iP1/evmMJKI7sNxzx20S6Y=
github.com/grafana/mimir-prometheus v0.0.0-20241018090525-641277312a18 h1:Ks/tOvcqDtsduF1VFI2yHZpNY6y8zF+3yyJSVTYrF3c=
github.com/grafana/mimir-prometheus v0.0.0-20241018090525-641277312a18/go.mod h1:AvqWbZV+ePQxe3xQT4IX1iP1/evmMJKI7sNxzx20S6Y=
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.20240924175849-b8b7c2c74eb6 h1:nT8QXdJo6wHMBcF0xEoXxEWkoUZOyzV/jyi/u9l7YEk=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/prometheus/prometheus/tsdb/querier.go
View file

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

33 changes: 31 additions & 2 deletions vendor/github.com/prometheus/prometheus/tsdb/testutil.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 be8d96c

Please sign in to comment.