-
Notifications
You must be signed in to change notification settings - Fork 526
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade prometheus to July 14th a0571449fd3890a204893974bb8f69fd3633c89e #4
Changes from 4 commits
d5ef75b
4f69951
43f3861
ecc7149
23380f3
2fbe8d1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ module github.com/cortexproject/cortex | |
go 1.16 | ||
|
||
require ( | ||
cloud.google.com/go/bigtable v1.2.0 | ||
cloud.google.com/go/bigtable v1.3.0 | ||
cloud.google.com/go/storage v1.10.0 | ||
github.com/Azure/azure-pipeline-go v0.2.2 | ||
github.com/Azure/azure-storage-blob-go v0.8.0 | ||
|
@@ -12,7 +12,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.35 | ||
github.com/aws/aws-sdk-go v1.38.60 | ||
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b | ||
github.com/cespare/xxhash v1.1.0 | ||
github.com/dustin/go-humanize v1.0.0 | ||
|
@@ -45,28 +45,28 @@ require ( | |
github.com/opentracing-contrib/go-stdlib v1.0.0 | ||
github.com/opentracing/opentracing-go v1.2.0 | ||
github.com/pkg/errors v0.9.1 | ||
github.com/prometheus/alertmanager v0.22.1-0.20210603124511-8b584eb2265e | ||
github.com/prometheus/client_golang v1.10.0 | ||
github.com/prometheus/alertmanager v0.22.3-0.20210628111558-8491f816296b | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the latest master of alertmanager too. |
||
github.com/prometheus/client_golang v1.11.0 | ||
github.com/prometheus/client_model v0.2.0 | ||
github.com/prometheus/common v0.26.1-0.20210603143733-6ef301f414bf | ||
github.com/prometheus/prometheus v1.8.2-0.20210510213326-e313ffa8abf6 | ||
github.com/prometheus/common v0.29.0 | ||
github.com/prometheus/prometheus v1.8.2-0.20210714080906-a0571449fd38 | ||
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/stretchr/testify v1.7.0 | ||
github.com/thanos-io/thanos v0.19.1-0.20210427154226-d5bd651319d2 | ||
github.com/uber/jaeger-client-go v2.28.0+incompatible | ||
github.com/uber/jaeger-client-go v2.29.1+incompatible | ||
github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624 | ||
go.etcd.io/bbolt v1.3.5 | ||
go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f | ||
go.etcd.io/etcd/client/v3 v3.5.0-alpha.0.0.20210225194612-fa82d11a958a | ||
go.etcd.io/etcd/server/v3 v3.5.0-alpha.0.0.20210225194612-fa82d11a958a | ||
go.uber.org/atomic v1.7.0 | ||
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 | ||
go.uber.org/atomic v1.8.0 | ||
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b | ||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c | ||
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba | ||
google.golang.org/api v0.46.0 | ||
google.golang.org/grpc v1.37.0 | ||
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 | ||
google.golang.org/api v0.48.0 | ||
google.golang.org/grpc v1.38.0 | ||
gopkg.in/yaml.v2 v2.4.0 | ||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b | ||
sigs.k8s.io/yaml v1.2.0 | ||
|
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,7 +57,7 @@ var ( | |
} | ||
|
||
DefaultBlocksCompactorFactory = func(ctx context.Context, cfg Config, logger log.Logger, reg prometheus.Registerer) (compact.Compactor, compact.Planner, error) { | ||
compactor, err := tsdb.NewLeveledCompactor(ctx, reg, logger, cfg.BlockRanges.ToMilliseconds(), downsample.NewPool()) | ||
compactor, err := tsdb.NewLeveledCompactor(ctx, reg, logger, cfg.BlockRanges.ToMilliseconds(), downsample.NewPool(), nil) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This nil will result in this code: if mergeFunc == nil {
mergeFunc = storage.NewCompactingChunkSeriesMerger(storage.ChainedSeriesMerge)
} There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's correct. Will keep the previous behaviour 👍 |
||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1579,7 +1579,7 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) { | |
SeriesLifecycleCallback: userDB, | ||
BlocksToDelete: userDB.blocksToDelete, | ||
MaxExemplars: i.cfg.BlocksStorageConfig.TSDB.MaxExemplars, | ||
}) | ||
}, nil) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the stats for TSDB's head, used to track the WAL replay status |
||
if err != nil { | ||
return nil, errors.Wrapf(err, "failed to open TSDB: %s", udir) | ||
} | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we now reference this repo's PRs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess so as well. However, we typically don't mention vendor upgrades in CHANGELOG unless there's any impactful change to Cortex (and if there is, than we mention that change).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After reviewing all
vendor/github.com/prometheus/*
changes, I think there's nothing worth to report in our CHANGELOG.