diff --git a/operations/helm/charts/mimir-distributed/Chart.yaml b/operations/helm/charts/mimir-distributed/Chart.yaml index 6efec1d293d..98ea8e91422 100644 --- a/operations/helm/charts/mimir-distributed/Chart.yaml +++ b/operations/helm/charts/mimir-distributed/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -version: 4.0.0-weekly.206 -appVersion: r206 +version: 3.2.0-rc.0 +appVersion: 2.4.0 description: "Grafana Mimir" -home: https://grafana.com/docs/mimir/v2.3.x/ +home: https://grafana.com/docs/mimir/v2.4.x/ icon: https://grafana.com/static/img/logos/logo-mimir.svg kubeVersion: ^1.20.0-0 name: mimir-distributed diff --git a/operations/helm/charts/mimir-distributed/README.md b/operations/helm/charts/mimir-distributed/README.md index 8d65799681f..d54a5213e8e 100644 --- a/operations/helm/charts/mimir-distributed/README.md +++ b/operations/helm/charts/mimir-distributed/README.md @@ -1,8 +1,8 @@ # Grafana Mimir Helm chart -Helm chart for deploying [Grafana Mimir](https://grafana.com/docs/mimir/v2.3.x/) or optionally [Grafana Enterprise Metrics](https://grafana.com/docs/enterprise-metrics/v2.3.x/) to Kubernetes. Derived from [Grafana Enterprise Metrics Helm Chart](https://github.com/grafana/helm-charts/blob/main/charts/enterprise-metrics/README.md) +Helm chart for deploying [Grafana Mimir](https://grafana.com/docs/mimir/v2.4.x/) or optionally [Grafana Enterprise Metrics](https://grafana.com/docs/enterprise-metrics/v2.4.x/) to Kubernetes. Derived from [Grafana Enterprise Metrics Helm chart](https://github.com/grafana/helm-charts/blob/main/charts/enterprise-metrics/README.md) -See the [Grafana Mimir version 2.3 release notes](https://grafana.com/docs/mimir/v2.3.x/release-notes/v2.3/). +See the [Grafana Mimir version 2.4 release notes](https://grafana.com/docs/mimir/v2.4.x/release-notes/v2.4/). When upgrading from Helm chart version 2.1, please see [Upgrade the Grafana Mimir Helm chart from version 2.1 to 3.0](https://grafana.com/docs/mimir/latest/operators-guide/deploying-grafana-mimir/upgrade-helm-chart-2.1-to-3.0/) as well. @@ -10,7 +10,7 @@ When upgrading from Helm chart version 2.1, please see [Upgrade the Grafana Mimi # mimir-distributed -![Version: 4.0.0-weekly.206](https://img.shields.io/badge/Version-4.0.0--weekly.206-informational?style=flat-square) ![AppVersion: r206](https://img.shields.io/badge/AppVersion-r206-informational?style=flat-square) +![Version: 3.2.0-rc.0](https://img.shields.io/badge/Version-3.2.0--rc.0-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square) Grafana Mimir @@ -30,12 +30,12 @@ Kubernetes: `^1.20.0-0` Grafana Mimir and Grafana Enterprise Metrics require an object storage backend to store metrics and indexes. The default chart values will deploy [Minio](https://min.io) for initial set up. Production deployments should use a separately deployed object store. -See [Grafana Mimir documentation](https://grafana.com/docs/mimir/v2.3.x/) for details on storage types and documentation. +See [Grafana Mimir documentation](https://grafana.com/docs/mimir/v2.4.x/) for details on storage types and documentation. ### Grafana Enterprise Metrics license In order to use the enterprise features of this chart, you need to provide the contents of a Grafana Enterprise Metrics license file as the value for the `license.contents` variable. -To obtain a Grafana Enterprise Metrics license, refer to [Get a license](https://grafana.com/docs/enterprise-metrics/v2.3.x/setup/#get-a-gem-license). +To obtain a Grafana Enterprise Metrics license, refer to [Get a license](https://grafana.com/docs/enterprise-metrics/v2.4.x/setup/#get-a-gem-license). ### Helm3 @@ -67,7 +67,7 @@ resources (CPU/memory) available in your cluster before installing Grafana Mimir ### Migration from Cortex to Grafana Mimir -Please consult the [Migration from Cortex to Grafana](https://grafana.com/docs/mimir/v2.3.x/migration-guide/migrating-from-cortex/) guide on how to update the configuration. +Please consult the [Migration from Cortex to Grafana](https://grafana.com/docs/mimir/v2.4.x/migration-guide/migrating-from-cortex/) guide on how to update the configuration. Prepare a custom values file with the contents: ```yaml @@ -139,7 +139,7 @@ production clusters at this scale. It is important to ensure that you run no more than one ingester replica per node so that a single node failure does not cause data loss. Zone aware replication can be configured to ensure data replication spans availability -zones. Refer to [Zone Aware Replication](https://grafana.com/docs/mimir/v2.3.x/operators-guide/configuring/configuring-zone-aware-replication/) +zones. Refer to [Zone Aware Replication](https://grafana.com/docs/mimir/v2.4.x/operators-guide/configuring/configuring-zone-aware-replication/) for more information. Minio is no longer enabled and you are encouraged to use your cloud providers object storage service for production deployments. @@ -160,7 +160,7 @@ production clusters at this scale. It is important to ensure that you run no more than one ingester replica per node so that a single node failure does not cause data loss. Zone aware replication can be configured to ensure data replication spans availability -zones. Refer to [Zone Aware Replication](https://grafana.com/docs/mimir/v2.3.x/operators-guide/configuring/configuring-zone-aware-replication/) +zones. Refer to [Zone Aware Replication](https://grafana.com/docs/mimir/v2.4.x/operators-guide/configuring/configuring-zone-aware-replication/) for more information. Minio is no longer enabled and you are encouraged to use your cloud providers object storage service for production deployments. diff --git a/operations/helm/charts/mimir-distributed/README.md.gotmpl b/operations/helm/charts/mimir-distributed/README.md.gotmpl index 9c79614f11b..ceaeb52c56a 100644 --- a/operations/helm/charts/mimir-distributed/README.md.gotmpl +++ b/operations/helm/charts/mimir-distributed/README.md.gotmpl @@ -1,8 +1,8 @@ # Grafana Mimir Helm chart -Helm chart for deploying [Grafana Mimir]({{ template "chart.homepage" . }}) or optionally [Grafana Enterprise Metrics](https://grafana.com/docs/enterprise-metrics/v2.3.x/) to Kubernetes. Derived from [Grafana Enterprise Metrics Helm Chart](https://github.com/grafana/helm-charts/blob/main/charts/enterprise-metrics/README.md) +Helm chart for deploying [Grafana Mimir]({{ template "chart.homepage" . }}) or optionally [Grafana Enterprise Metrics](https://grafana.com/docs/enterprise-metrics/v2.4.x/) to Kubernetes. Derived from [Grafana Enterprise Metrics Helm chart](https://github.com/grafana/helm-charts/blob/main/charts/enterprise-metrics/README.md) -See the [Grafana Mimir version 2.3 release notes](https://grafana.com/docs/mimir/v2.3.x/release-notes/v2.3/). +See the [Grafana Mimir version 2.4 release notes](https://grafana.com/docs/mimir/v2.4.x/release-notes/v2.4/). When upgrading from Helm chart version 2.1, please see [Upgrade the Grafana Mimir Helm chart from version 2.1 to 3.0](https://grafana.com/docs/mimir/latest/operators-guide/deploying-grafana-mimir/upgrade-helm-chart-2.1-to-3.0/) as well. @@ -30,7 +30,7 @@ See [Grafana Mimir documentation]({{ template "chart.homepage" . }}) for details ### Grafana Enterprise Metrics license In order to use the enterprise features of this chart, you need to provide the contents of a Grafana Enterprise Metrics license file as the value for the `license.contents` variable. -To obtain a Grafana Enterprise Metrics license, refer to [Get a license](https://grafana.com/docs/enterprise-metrics/v2.3.x/setup/#get-a-gem-license). +To obtain a Grafana Enterprise Metrics license, refer to [Get a license](https://grafana.com/docs/enterprise-metrics/v2.4.x/setup/#get-a-gem-license). ### Helm3 diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index 0fbc744e3f9..fd8f28cc149 100644 --- a/operations/helm/charts/mimir-distributed/values.yaml +++ b/operations/helm/charts/mimir-distributed/values.yaml @@ -25,7 +25,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: r206-310ea58 + tag: 2.4.0-rc.1 # -- 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 @@ -1983,7 +1983,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: r206-546eba98 + tag: v2.4.0-rc.1 # 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 @@ -2504,7 +2504,7 @@ gr-metricname-cache: smoke_test: image: repository: grafana/mimir-continuous-test - tag: r206-310ea58 + tag: 2.4.0-rc.1 pullPolicy: IfNotPresent tenantId: '' extraArgs: {} @@ -2524,7 +2524,7 @@ continuous_test: replicas: 1 image: repository: grafana/mimir-continuous-test - tag: r206-310ea58 + tag: 2.4.0-rc.1 pullPolicy: IfNotPresent # Note: optional pullSecrets are set in toplevel 'image' section, not here