Upgrade prometheus to July 14th a0571449fd3890a204893974bb8f69fd3633c89e #4

colega · 2021-07-15T13:53:36Z

What this PR does: Upgrades prometheus to prometheus/prometheus@a057144

Checklist

Tests updated
Documentation added
CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

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>

colega · 2021-07-15T13:58:36Z

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog

 ## master / unreleased
+* [ENHANCEMENT] Prometheus upgraded. #4


I guess we now reference this repo's PRs?

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).

After reviewing all vendor/github.com/prometheus/* changes, I think there's nothing worth to report in our CHANGELOG.

colega · 2021-07-15T13:58:57Z

go.mod

@@ -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


This is the latest master of alertmanager too.

colega · 2021-07-15T14:00:17Z

pkg/compactor/compactor.go

@@ -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)


This nil will result in this code:

if mergeFunc == nil { mergeFunc = storage.NewCompactingChunkSeriesMerger(storage.ChainedSeriesMerge) }

That's correct. Will keep the previous behaviour 👍

pkg/configs/userconfig/config.go

colega · 2021-07-15T14:02:33Z

pkg/ingester/ingester_v2.go

@@ -1579,7 +1579,7 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) {
 		SeriesLifecycleCallback:   userDB,
 		BlocksToDelete:            userDB.blocksToDelete,
 		MaxExemplars:              i.cfg.BlocksStorageConfig.TSDB.MaxExemplars,
-	})
+	}, nil)


This is the stats for TSDB's head, used to track the WAL replay status

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

pracucci

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.

pracucci · 2021-07-16T12:03:16Z

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog

 ## master / unreleased
+* [ENHANCEMENT] Prometheus upgraded. #4


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).

pracucci · 2021-07-16T12:07:54Z

pkg/compactor/compactor.go

@@ -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)


That's correct. Will keep the previous behaviour 👍

pkg/configs/userconfig/config.go

pracucci · 2021-07-16T12:33:20Z

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog

 ## master / unreleased
+* [ENHANCEMENT] Prometheus upgraded. #4


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>

colega added 4 commits July 15, 2021 15:56

Upgrade prometheus version to a0571449fd3890a204893974bb8f69fd3633c89e

d5ef75b

This doesn't compile, just go mod tidy and go mod vendor. Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

Use default tsdb stats and merge func in compactor

4f69951

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

Adapt to alert config

43f3861

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

Update changelog

ecc7149

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

colega force-pushed the colega/upgrade-prometheus-2021-07 branch from a178913 to ecc7149 Compare July 15, 2021 13:57

colega commented Jul 15, 2021

View reviewed changes

pkg/configs/userconfig/config.go Show resolved Hide resolved

colega commented Jul 15, 2021

View reviewed changes

Fix lint by using collectors.NewGoCollector()

23380f3

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

colega mentioned this pull request Jul 16, 2021

LabelNames API with matchers #3

Merged

4 tasks

pracucci approved these changes Jul 16, 2021

View reviewed changes

Revert CHANGELOG.md as there's nothing special to mention

2fbe8d1

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

pracucci enabled auto-merge (squash) July 16, 2021 12:37

pracucci merged commit 66cbf91 into main Jul 16, 2021

pracucci deleted the colega/upgrade-prometheus-2021-07 branch July 16, 2021 13:05

This was referenced Jul 16, 2021

Removed configdb support from Ruler and Alertmanager backends #15

Merged

Upgrade Prometheus to 59d02b5ef003f125286a62aa6daf4c8b7583042f #16

Merged

pstibrany added a commit that referenced this pull request Feb 28, 2022

Make linter happy #4. I can do this.

7d0b2f6

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

09jvilla mentioned this pull request Apr 28, 2022

Add compactor HTTP API for uploading TSDB blocks #1694

Merged

18 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade prometheus to July 14th a0571449fd3890a204893974bb8f69fd3633c89e #4

Upgrade prometheus to July 14th a0571449fd3890a204893974bb8f69fd3633c89e #4

colega commented Jul 15, 2021

colega Jul 15, 2021

pracucci Jul 16, 2021

pracucci Jul 16, 2021

colega Jul 15, 2021

colega Jul 15, 2021

pracucci Jul 16, 2021

colega Jul 15, 2021

pracucci left a comment

pracucci Jul 16, 2021

pracucci Jul 16, 2021

pracucci Jul 16, 2021

Upgrade prometheus to July 14th a0571449fd3890a204893974bb8f69fd3633c89e #4

Upgrade prometheus to July 14th a0571449fd3890a204893974bb8f69fd3633c89e #4

Conversation

colega commented Jul 15, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pracucci left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment