Merge 2.3 to main #2995

treid314 · 2022-09-20T17:15:11Z

What this PR does

As part of the 2.3 release we want to merge the release branch to main to update the changelog and meta files.

Which issue(s) this PR fixes or relates to

Checklist

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

* Update release version, images, and dashboard screenshots

* Helm: open port 80 on enterprise gateway We opened 8080 by default default and this is kept as legacy. NOTEX.txt assumed we open port 80 by default, this is fixed by encoding 80 in the values file. Updated docstring. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> (cherry picked from commit b9d1e9e)

) (#2901) The new defaults mean that gRPC will rebalance connections periodically, letting new servers have connections on scale-out. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> (cherry picked from commit 957c33b)

(cherry picked from commit 34c61af)

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Publish mimir-distributed 3.1.0-rc.0 Using r201 weekly for GEM as we don't have release candidate. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* Helm: move recent changelog entries to release 3.1 Main has been merged into the release-2.3 branch. * Helm: note about importance of CHANGELOG Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

This is a workaround for: prometheus/alertmanager#3064 To prevent panics when unmarshalling email headers from configuration. (cherry picked from commit 68b6197) Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>

* Update release notes with Helm changes. * Mention deprecated, removed option. * Edit release notes for Mimir 2.3 (#2916) * Update v2.3.md * Move Helm chart release notes to their own section Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Jesse Weaver <jesse.weaver@grafana.com>

* Update version and changelog for 2.3.0-rc.2 * remove blank changelog entries

…ng Alertmanager in microservices mode (#2947) (#2948) * Fix sanity check done on configured filesystem directories when running Alertmanager in microservices mode Signed-off-by: Marco Pracucci <marco@pracucci.com> * Added CHANGELOG entry Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Marco Pracucci <marco@pracucci.com> (cherry picked from commit bfad6ac)

… 2.3.0-rc.2 (#2961)

) (#2969) (cherry picked from commit 48ee50c) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

…ease (#2985)

CHANGELOG.md

pstibrany · 2022-09-21T08:11:15Z

CHANGELOG.md

+* [BUGFIX] Memberlist: retry joining memberlist cluster on startup when no nodes are resolved. #2837
+* [BUGFIX] Query-frontend: fix incorrect mapping of http status codes 413 to 500 when request is too large. #2819
+* [BUGFIX] Alertmanager: revert upstream alertmananger to v0.24.0 to fix panic when unmarshalling email headers #2924 #2925
+* [BUGFIX] Fix sanity check done on configured filesystem directories when running Alertmanager in microservices mode. #2947


This entry should be added to:

[ENHANCEMENT] Add sanity check at startup to ensure the configured filesystem directories don't overlap for different components. Add sanity check at startup to ensure the configured filesystem directories don't overlap for different components #2828

Is there a process to finding these? Or do you just know? I think I'm missing a step here.

https://github.com/grafana/mimir/pull/2995/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR98 That's added here

I just noticed that bugfix is related to the feature that's new in 2.3. It was pure luck, no process :-(

pstibrany · 2022-09-21T08:11:55Z

CHANGELOG.md

 * [CHANGE] Anonymous usage statistics tracking: added the `-ingester.ring.store` value. #2981
-* [FEATURE] Introduced an anonymous usage statistics tracking (enabled by default), to help Mimir maintainers make better decisions to support the open source community. The tracking system anonymously collects non-sensitive, non-personally identifiable information about the running Mimir cluster. #2643 #2662 #2685 #2732 #2733 #2735 #2939 #2940


This entry needs to be split between 2.3.0 and main. PRs #2939 #2940 are only in main.

In main changelog we could write:

* [CHANGE] Anonymous usage statistics tracking has been enabled by default, to help Mimir maintainers make better decisions to support the open source community. #2939 * [CHANGE] Anonymous usage statistics tracking: added the minimum and maximum value of `-ingester.out-of-order-time-window`. #2940

~~This entry has been lost. You should move it to 2.3 changelog, removing #2939 #2940.~~

pstibrany · 2022-09-21T08:12:17Z

CHANGELOG.md

 * [CHANGE] Distributor: change the default value of `-distributor.remote-timeout` to `2s` from `20s` and `-distributor.forwarding.request-timeout` to `2s` from `10s` to improve distributor resource usage when ingesters crash. #2728
-* [CHANGE] Ingester: changed default setting for `-ingester.ring.readiness-check-ring-health` from `true` to `false`. #2953


I can't find this changelog entry in the merged changelog.

This is not part of 2.3. It should stay in main.

pracucci · 2022-09-21T13:52:04Z

CHANGELOG.md

 * [BUGFIX] Querier: Fix 400 response while handling streaming remote read. #2963
 * [BUGFIX] Fix a bug causing query-frontend, query-scheduler, and querier not failing if one of their internal components fail. #2978

 ### Mixin

-* [CHANGE] Dashboards: remove the "Cache - Latency (old)" panel from the "Mimir / Queries" dashboard. #2796
 * [CHANGE] Alerts: MimirQuerierAutoscalerNotActive is now critical and fires after 1h instead of 15m. #2958
 * [FEATURE] Dashboards: added support to experimental read-write deployment mode. #2780


This should be removed because included in the 2.3 changelog.

pracucci

LGTM! If there's anything missing, we'll fix in a follow up PR. Thanks!

pstibrany · 2022-09-21T14:45:40Z

Please make sure to merge this with a merge commit, not Squash and Merge. Thank you!

Tyler Reid and others added 17 commits September 7, 2022 09:41

Update release version and dashboard screenshots (#2885)

3d0c372

* Update release version, images, and dashboard screenshots

Remove duplicate dist directive (#2887)

ade20fa

Helm: Remove PSP if kubernetes doesn't support it (#2870) (#2902)

c0fe749

(cherry picked from commit 34c61af)

Update Helm changelog. (#2903)

fbbb6dd

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

Publish release-2.3.0-rc.1 (#2904)

9af08f0

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

release helm 3.1.0-rc.0 (#2907)

cf1bea2

* Publish mimir-distributed 3.1.0-rc.0 Using r201 weekly for GEM as we don't have release candidate. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

Revert upstream alertmanager to v0.24.0 (#2924) (#2925)

46083ec

This is a workaround for: prometheus/alertmanager#3064 To prevent panics when unmarshalling email headers from configuration. (cherry picked from commit 68b6197) Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>

Update version and changelog for 2.3.0-rc.2 (#2941)

95bf87b

* Update version and changelog for 2.3.0-rc.2 * remove blank changelog entries

Update the helm tags and docs to create 3.1.0-rc.1 with Mimir version…

a5b4dee

… 2.3.0-rc.2 (#2961)

Fix yaml in "Manage the configuration of Grafana Mimir with Helm" (#2895

4da82fd

) (#2969) (cherry picked from commit 48ee50c) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

Update version file, changelog, and screenshot to prepare for 2.3 rel…

b3f22b4

…ease (#2985)

Merge branch 'release-2.3' into merge-2.3-to-main

5a67a2d

treid314 requested review from osg-grafana and a team as code owners September 20, 2022 17:15

pstibrany reviewed Sep 20, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Sanitize changelog

a3ccd3b

johannaratliff approved these changes Sep 20, 2022

View reviewed changes

pstibrany reviewed Sep 21, 2022

View reviewed changes

pracucci reviewed Sep 21, 2022

View reviewed changes

changelog sweep

ac8c0c8

pracucci approved these changes Sep 21, 2022

View reviewed changes

treid314 merged commit a13959d into main Sep 21, 2022

treid314 deleted the merge-2.3-to-main branch September 21, 2022 14:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 2.3 to main #2995

Merge 2.3 to main #2995

treid314 commented Sep 20, 2022

pstibrany Sep 21, 2022

treid314 Sep 21, 2022

treid314 Sep 21, 2022

treid314 Sep 21, 2022

pstibrany Sep 21, 2022

pstibrany Sep 21, 2022

pracucci Sep 21, 2022

pracucci Sep 21, 2022 •

edited

pstibrany Sep 21, 2022

pracucci Sep 21, 2022

pracucci Sep 21, 2022

pracucci left a comment

pstibrany commented Sep 21, 2022

		* [CHANGE] Anonymous usage statistics tracking: added the `-ingester.ring.store` value. #2981
		* [FEATURE] Introduced an anonymous usage statistics tracking (enabled by default), to help Mimir maintainers make better decisions to support the open source community. The tracking system anonymously collects non-sensitive, non-personally identifiable information about the running Mimir cluster. #2643 #2662 #2685 #2732 #2733 #2735 #2939 #2940

		* [CHANGE] Distributor: change the default value of `-distributor.remote-timeout` to `2s` from `20s` and `-distributor.forwarding.request-timeout` to `2s` from `10s` to improve distributor resource usage when ingesters crash. #2728
		* [CHANGE] Ingester: changed default setting for `-ingester.ring.readiness-check-ring-health` from `true` to `false`. #2953

Merge 2.3 to main #2995

Merge 2.3 to main #2995

Conversation

treid314 commented Sep 20, 2022

What this PR does

Which issue(s) this PR fixes or relates to

Checklist

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 Sep 21, 2022 • edited

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

pstibrany commented Sep 21, 2022

pracucci Sep 21, 2022 •

edited