Skip to content

Commit

Permalink
Upgrade Prometheus (#139)
Browse files Browse the repository at this point in the history
Signed-off-by: Marco Pracucci <marco@pracucci.com>
  • Loading branch information
pracucci committed Aug 17, 2021
1 parent 184bffd commit c084db8
Show file tree
Hide file tree
Showing 186 changed files with 5,609 additions and 3,255 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -26,6 +26,7 @@
* New exported metrics:
* `cortex_bucket_store_series_hash_cache_requests_total`
* `cortex_bucket_store_series_hash_cache_hits_total`
* [FEATURE] PromQL: added `present_over_time` support. #139
* [ENHANCEMENT] Include additional limits in the per-tenant override exporter. The following limits have been added to the `cortex_overrides` metric: #21
* `max_fetched_series_per_query`
* `max_fetched_chunk_bytes_per_query`
Expand Down
26 changes: 14 additions & 12 deletions go.mod
Expand Up @@ -11,7 +11,7 @@ require (
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
github.com/alicebob/miniredis/v2 v2.14.3
github.com/armon/go-metrics v0.3.6
github.com/aws/aws-sdk-go v1.38.60
github.com/aws/aws-sdk-go v1.40.10
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/cespare/xxhash v1.1.0
github.com/dustin/go-humanize v1.0.0
Expand All @@ -26,11 +26,11 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/gogo/status v1.0.3
github.com/golang/protobuf v1.5.2
github.com/golang/snappy v0.0.3
github.com/gorilla/mux v1.7.3
github.com/golang/snappy v0.0.4
github.com/gorilla/mux v1.8.0
github.com/grafana/dskit v0.0.0-20210813141227-f25e16ec09b2
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
github.com/hashicorp/consul/api v1.8.1
github.com/hashicorp/consul/api v1.9.1
github.com/hashicorp/go-cleanhttp v0.5.1
github.com/hashicorp/go-sockaddr v1.0.2
github.com/hashicorp/memberlist v0.2.3
Expand All @@ -47,11 +47,11 @@ require (
github.com/prometheus/alertmanager v0.22.3-0.20210628111558-8491f816296b
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.29.0
github.com/prometheus/common v0.30.0
github.com/prometheus/prometheus v1.8.2-0.20210720123808-b1ed4a0a663d
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
github.com/sony/gobreaker v0.4.1
github.com/spf13/afero v1.2.2
github.com/spf13/afero v1.3.4
github.com/stretchr/testify v1.7.0
github.com/thanos-io/thanos v0.19.1-0.20210804003402-cd18b6155169
github.com/uber/jaeger-client-go v2.29.1+incompatible
Expand All @@ -62,12 +62,11 @@ require (
go.etcd.io/etcd/server/v3 v3.5.0-alpha.0.0.20210225194612-fa82d11a958a
go.uber.org/atomic v1.9.0
go.uber.org/goleak v1.1.10
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
golang.org/x/tools v0.1.5 // indirect
google.golang.org/api v0.48.0
google.golang.org/grpc v1.38.0
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/api v0.51.0
google.golang.org/grpc v1.39.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
sigs.k8s.io/yaml v1.2.0
Expand All @@ -87,9 +86,12 @@ replace github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915
replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab

// Using a fork of Prometheus while we work on querysharding to avoid a dependency on the upstream.
replace github.com/prometheus/prometheus => github.com/grafana/prometheus-private v0.0.0-20210720123808-b1ed4a0a663d
replace github.com/prometheus/prometheus => github.com/grafana/prometheus-private v0.0.0-20210813131603-a3ad21265842

// Pin hashicorp depencencies since the Prometheus fork, go mod tries to update them.
replace github.com/hashicorp/go-immutable-radix => github.com/hashicorp/go-immutable-radix v1.2.0

replace github.com/hashicorp/go-hclog => github.com/hashicorp/go-hclog v0.12.2

// TODO review the change introduced by https://github.com/grpc/grpc-go/pull/4416 before upgrading to 1.39.0
replace google.golang.org/grpc => google.golang.org/grpc v1.38.0
208 changes: 106 additions & 102 deletions go.sum

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions vendor/cloud.google.com/go/CHANGES.md

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

4 changes: 2 additions & 2 deletions vendor/cloud.google.com/go/README.md

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

16 changes: 8 additions & 8 deletions vendor/cloud.google.com/go/go.mod

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

0 comments on commit c084db8

Please sign in to comment.