Skip to content

Commit

Permalink
Update prometheus dependency to include interner leak fix (#636)
Browse files Browse the repository at this point in the history
* update prometheus dependency to include grafana/prometheus#21

* grant operator test more time to run in CI
  • Loading branch information
rfratto authored Jun 8, 2021
1 parent 09d678e commit e5aa7a5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
- [ENHANCEMENT] Error messages when installing the Grafana Agent for Grafana
Cloud will now be shown. (@rfratto)

- [BUGFIX] Fix a leak in the shared string interner introduced in v0.14.0.
This fix was made to a [dependency](https://github.com/grafana/prometheus/pull/21).
(@rfratto)

# v0.15.0 (2021-06-03)

BREAKING CHANGE: Configuration of Tempo Autologging changed in this release.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ replace (
k8s.io/client-go => k8s.io/client-go v0.21.0
)

replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20210524183401-38b723fed019
replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20210608193638-7b78de4ccffc

replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20200521142311-984fc90c8a04

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ github.com/grafana/postgres_exporter v0.8.1-0.20201106170118-5eedee00c1db h1:VYE
github.com/grafana/postgres_exporter v0.8.1-0.20201106170118-5eedee00c1db/go.mod h1:0EpacXQxjcMlLqvOcA5x2WuOR2tobrsHf9avFj3TAxY=
github.com/grafana/process-exporter v0.7.3-0.20210106202358-831154072e2a h1:JUnP/laSl2GylHT0+fqAqOZY+7XkLh1mLefLN0n8Mmk=
github.com/grafana/process-exporter v0.7.3-0.20210106202358-831154072e2a/go.mod h1:RMjrx3Qn8l2pgCD27g45xbko4UDpVVuHC8Cd2YXPtWA=
github.com/grafana/prometheus v1.8.2-0.20210524183401-38b723fed019 h1:4Xn6PVdmHdSm7UmEFJELAKPNMZMP53k/R63iNoR/C6s=
github.com/grafana/prometheus v1.8.2-0.20210524183401-38b723fed019/go.mod h1:yUzDYX0hIYu5YVHmpj/JXLOclB6QcLNDgmagD3FUnSU=
github.com/grafana/prometheus v1.8.2-0.20210608193638-7b78de4ccffc h1:brKRMe6V7k9z9AvxnuhP7hCfHD5coXpifLdqlxLRPCE=
github.com/grafana/prometheus v1.8.2-0.20210608193638-7b78de4ccffc/go.mod h1:yUzDYX0hIYu5YVHmpj/JXLOclB6QcLNDgmagD3FUnSU=
github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03 h1:fGgFrAraMB0BaPfYumu+iulfDXwHm+GFyHA4xEtBqI8=
github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03/go.mod h1:GIMXMPB/lRAllP5rVDvcGif87ryO2hgD7tCtHMdHrho=
github.com/grafana/windows_exporter v0.15.1-0.20210325142439-9e8f66d53433 h1:3WaMH1VOp8T2gCwjM5iHtH2SW3BpN8pAmRhzy9TYVAA=
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/selector_eventhandler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var (
func TestEnqueueRequestForSelector(t *testing.T) {
l := log.NewNopLogger()

ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()

var env envtest.Environment
Expand Down

0 comments on commit e5aa7a5

Please sign in to comment.