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.

Sign up for GitHub

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

Merge mimir-distributed-release-5.6 to main #10448

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Merge mimir-distributed-release-5.6 to main #10448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7812968
Helm chart 5.6 release candidate on Mimir 2.15.0-rc.0 (#10369)
chencs Jan 14, 2025
a3ae5dd
helm: Cut mimir-distributed release 5.6.0 (#10447)
chencs Jan 16, 2025
c0e9ebb
Merge mimir-distributed-release-5.6 branch to main
chencs Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/sources/helm-charts/mimir-distributed/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ keywords:
- Grafana Enterprise Metrics
- Grafana metrics
cascade:
MIMIR_VERSION: "v2.14.x"
GEM_VERSION: "v2.14.x"
MIMIR_VERSION: "v2.15.x"
GEM_VERSION: "v2.15.x"
ALLOY_VERSION: "latest"
---

Expand Down
3 changes: 2 additions & 1 deletion operations/helm/charts/mimir-distributed/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ Entries should include a reference to the Pull Request that introduced the chang
* [ENHANCEMENT] Individual mimir components can override their container images via the *.image values. The component's image definitions always override the values set in global `image` or `enterprise.image`. #10340
* [BUGFIX] Fix calculation of `mimir.siToBytes` and use floating point arithmetics. #10044

## 5.6.0-rc.0
## 5.6.0

* [ENHANCEMENT] Upgrade Mimir and GEM to [2.15.0-rc.0](https://github.com/grafana/mimir/blob/main/CHANGELOG.md#2150). #10369
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't release the final chart version with the RC of Mimir, do we? 🙈

* [CHANGE] Update rollout-operator version to 0.20.0. #9995
* [CHANGE] Remove the `track_sizes` feature for Memcached pods since it is unused. #10032
* [FEATURE] Add support for GEM's federation-frontend. See the `federation_frontend` section in the values file. #9673
Expand Down
4 changes: 2 additions & 2 deletions operations/helm/charts/mimir-distributed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
version: 5.6.0-weekly.325
appVersion: r325
version: 5.6.0
appVersion: 2.15.0
description: "Grafana Mimir"
home: https://grafana.com/docs/helm-charts/mimir-distributed/latest/
icon: https://grafana.com/static/img/logos/logo-mimir.svg
Expand Down
4 changes: 2 additions & 2 deletions operations/helm/charts/mimir-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana Mimir](https://grafana.com/docs/mimir/latest/)

For the full documentation, visit [Grafana mimir-distributed Helm chart documentation](https://grafana.com/docs/helm-charts/mimir-distributed/latest/).

> **Note:** The documentation version is derived from the Helm chart version which is 5.6.0-weekly.325.
> **Note:** The documentation version is derived from the Helm chart version which is 5.6.0.

When upgrading from Helm chart version 4.X, please see [Migrate the Helm chart from version 4.x to 5.0](https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-helm-chart-4.x-to-5.0/).
When upgrading from Helm chart version 3.x, please see [Migrate from single zone to zone-aware replication with Helm](https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-from-single-zone-with-helm/).
Expand All @@ -14,7 +14,7 @@ When upgrading from Helm chart version 2.1, please see [Upgrade the Grafana Mimi

# mimir-distributed

![Version: 5.6.0-weekly.325](https://img.shields.io/badge/Version-5.6.0--weekly.325-informational?style=flat-square) ![AppVersion: r325](https://img.shields.io/badge/AppVersion-r325-informational?style=flat-square)
![Version: 5.6.0](https://img.shields.io/badge/Version-5.6.0-informational?style=flat-square) ![AppVersion: 2.15.0](https://img.shields.io/badge/AppVersion-2.15.0-informational?style=flat-square)

Grafana Mimir

Expand Down
4 changes: 2 additions & 2 deletions operations/helm/charts/mimir-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ image:
# -- Grafana Mimir container image repository. Note: for Grafana Enterprise Metrics use the value 'enterprise.image.repository'
repository: grafana/mimir
# -- Grafana Mimir container image tag. Note: for Grafana Enterprise Metrics use the value 'enterprise.image.tag'
tag: r325-ed3160e
tag: 2.15.0
# -- Container pull policy - shared between Grafana Mimir and Grafana Enterprise Metrics
pullPolicy: IfNotPresent
# -- Optionally specify an array of imagePullSecrets - shared between Grafana Mimir and Grafana Enterprise Metrics
Expand Down Expand Up @@ -4037,7 +4037,7 @@ enterprise:
# -- Grafana Enterprise Metrics container image repository. Note: for Grafana Mimir use the value 'image.repository'
repository: grafana/enterprise-metrics
# -- Grafana Enterprise Metrics container image tag. Note: for Grafana Mimir use the value 'image.tag'
tag: r325-624b3501
tag: v2.15.0
# Note: pullPolicy and optional pullSecrets are set in toplevel 'image' section, not here

# In order to use Grafana Enterprise Metrics features, you will need to provide the contents of your Grafana Enterprise Metrics
Expand Down
Loading