-
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
Conversation
This doesn't compile, just go mod tidy and go mod vendor. Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
a178913
to
ecc7149
Compare
CHANGELOG.md
Outdated
@@ -1,6 +1,7 @@ | |||
# Changelog | |||
|
|||
## master / unreleased | |||
* [ENHANCEMENT] Prometheus upgraded. #4 |
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.
@@ -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 comment
The reason will be displayed to describe this comment to others. Learn more.
This is the latest master of alertmanager too.
@@ -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 comment
The 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 comment
The reason will be displayed to describe this comment to others. Learn more.
That's correct. Will keep the previous behaviour 👍
@@ -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 comment
The 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
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
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 reviewed all vendor/github.com/prometheus/*
changes and LGTM. Your changes to Mimir are correct. I just left a nit about the CHANGELOG and then we can merge.
CHANGELOG.md
Outdated
@@ -1,6 +1,7 @@ | |||
# Changelog | |||
|
|||
## master / unreleased | |||
* [ENHANCEMENT] Prometheus upgraded. #4 |
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).
@@ -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 comment
The reason will be displayed to describe this comment to others. Learn more.
That's correct. Will keep the previous behaviour 👍
CHANGELOG.md
Outdated
@@ -1,6 +1,7 @@ | |||
# Changelog | |||
|
|||
## master / unreleased | |||
* [ENHANCEMENT] Prometheus upgraded. #4 |
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.
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
# This is the 1st commit message: Add MaxTotalQueryLength and fill it from MaxQueryLength if 0 Add the ability to define a higher total query length limit on the frontend , compared to the current shared limit between querier and query-frontend. Ref: grafana/mimir-squad#889 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> # Conflicts: # CHANGELOG.md # This is the commit message #2: Update runbook # This is the commit message #3: Update pkg/util/validation/limits.go Co-authored-by: Nick Pillitteri <56quarters@users.noreply.github.com> # This is the commit message #4: Rename store.max-total-query-length to query-frontend... Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
What this PR does: Upgrades prometheus to prometheus/prometheus@a057144
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]