Skip to content
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

Promote experimental features to stable #8400

Merged
merged 4 commits into from
Jun 18, 2024

Conversation

dimitarvdimitrov
Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov commented Jun 17, 2024

What this PR does

  • ruler tenant federation support
  • limiting max-tenants for federated queries
  • enabling/disabling recording & alerting rules per tenant

I looked mostly at features that have been added a long time ago (~2 years for ruler changes) and that have been at use extensively by the community (multi-tenant ruler) or at Grafana Labs (enabling/disabling rule evaluations & max-tenants limit for federated queries).

This PR also fixes a typo and adds the PR number for a changelog entry

Which issue(s) this PR fixes or relates to

Related to #8390

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

@dimitarvdimitrov dimitarvdimitrov requested review from jdbaldry and a team as code owners June 17, 2024 14:15
@dimitarvdimitrov dimitarvdimitrov mentioned this pull request Jun 17, 2024
66 tasks
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked all other experimental features listed at docs/sources/mimir/configure/about-versioning.md and I can't see anything that I'm very eager to promote to stable, so LGTM.

Copy link
Contributor

@56quarters 56quarters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

While we're here, -tenant-federation.max-tenants is OK to be promoted to stable.

I looked mostly at features that have been added a long time ago (~2 years for ruler changes) and that have been at use extensively by the community (multi-tenant ruler) or at Grafana Labs (enabling/disabling rule evaluations).

This PR also fixes a typo and adds the PR number for a changelog entry

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
@dimitarvdimitrov dimitarvdimitrov force-pushed the dimitar/2.13/promote-ruler-features-to-stable branch from 8facce3 to 6c4d7a9 Compare June 18, 2024 08:56
@dimitarvdimitrov dimitarvdimitrov enabled auto-merge (squash) June 18, 2024 08:56
@dimitarvdimitrov dimitarvdimitrov merged commit 69c0f88 into main Jun 18, 2024
29 checks passed
@dimitarvdimitrov dimitarvdimitrov deleted the dimitar/2.13/promote-ruler-features-to-stable branch June 18, 2024 09:18
@grafanabot
Copy link
Contributor

The backport to r295 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8400-to-r295 origin/r295
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 69c0f88d9174465d690e10d92552a7d9afa3cac2
# Push it to GitHub
git push --set-upstream origin backport-8400-to-r295
git switch main
# Remove the local backport branch
git branch -D backport-8400-to-r295

Then, create a pull request where the base branch is r295 and the compare/head branch is backport-8400-to-r295.

dimitarvdimitrov added a commit that referenced this pull request Jun 18, 2024
* Promote experimental features to stable

I looked mostly at features that have been added a long time ago (~2 years for ruler changes) and that have been at use extensively by the community (multi-tenant ruler) or at Grafana Labs (enabling/disabling rule evaluations).

This PR also fixes a typo and adds the PR number for a changelog entry

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* add number to CHANGELOG.md

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Udpate autogenerated docs

* Promote max-tenants to stable

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
(cherry picked from commit 69c0f88)
dimitarvdimitrov added a commit that referenced this pull request Jun 18, 2024
* Promote experimental features to stable

I looked mostly at features that have been added a long time ago (~2 years for ruler changes) and that have been at use extensively by the community (multi-tenant ruler) or at Grafana Labs (enabling/disabling rule evaluations).

This PR also fixes a typo and adds the PR number for a changelog entry

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* add number to CHANGELOG.md

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Udpate autogenerated docs

* Promote max-tenants to stable

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
(cherry picked from commit 69c0f88)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants