Skip to content

Update prometheus#1335

Merged
gouthamve merged 2 commits intocortexproject:masterfrom
gouthamve:update-prom
Apr 17, 2019
Merged

Update prometheus#1335
gouthamve merged 2 commits intocortexproject:masterfrom
gouthamve:update-prom

Conversation

@gouthamve
Copy link
Contributor

Hit this:

CGO_ENABLED=0 go build -ldflags "-extldflags \"-static\" -s -w" -tags netgo -o cmd/ruler/ruler ./cmd/ruler
vendor/github.com/prometheus/prometheus/discovery/consul/consul.go:461:29: catalog.ServiceMultipleTags undefined (type *api.Catalog has no field or method ServiceMultipleTags)
vendor/github.com/prometheus/prometheus/discovery/gce/gce.go:124:15: undefined: compute.NewService

So updated the GCE and Consul deps too

Fixes #1284

Signed-off-by: Goutham Veeramachaneni gouthamve@gmail.com

@gouthamve gouthamve requested review from bboreham and tomwilkie and removed request for bboreham April 17, 2019 13:17
Hit this:
```
CGO_ENABLED=0 go build -ldflags "-extldflags \"-static\" -s -w" -tags netgo -o cmd/ruler/ruler ./cmd/ruler
vendor/github.com/prometheus/prometheus/discovery/consul/consul.go:461:29: catalog.ServiceMultipleTags undefined (type *api.Catalog has no field or method ServiceMultipleTags)
vendor/github.com/prometheus/prometheus/discovery/gce/gce.go:124:15: undefined: compute.NewService
```

So updated the GCE and Consul deps too

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Copy link
Contributor

@bboreham bboreham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@gouthamve gouthamve merged commit cbfdbdb into cortexproject:master Apr 17, 2019
@gouthamve gouthamve deleted the update-prom branch April 17, 2019 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

*_over_time incorrect with subquery

2 participants