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.5 to main #9613

Merged
merged 5 commits into from
Oct 14, 2024
Merged

Merge mimir-distributed-release-5.5 to main #9613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b556ba
helm: release mimir-distributed 5.5.0-rc.0 (#9488)
narqo Oct 2, 2024
2479143
helm: release notes for 5.5.0 (#9489) (#9526)
grafanabot Oct 4, 2024
4acb439
helm: Cut mimir-distributed release 5.5.0 (#9591)
narqo Oct 14, 2024
06e4a79
mimir-distributed: fixup changelog (#9611)
narqo Oct 14, 2024
ce3619a
Merge mimir-distributed-release-5.5 branch to main
narqo Oct 14, 2024
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.13.x"
GEM_VERSION: "v2.13.x"
MIMIR_VERSION: "v2.14.x"
GEM_VERSION: "v2.14.x"
ALLOY_VERSION: "latest"
---

Expand Down
2 changes: 1 addition & 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 @@ -29,7 +29,7 @@ Entries should include a reference to the Pull Request that introduced the chang

## main / unreleased

## 5.5.0-rc.0
## 5.5.0

* [ENHANCEMENT] Dashboards: allow switching between using classic or native histograms in dashboards.
* Overview dashboard: status, read/write latency and queries/ingestion per sec panels, `cortex_request_duration_seconds` metric. #7674
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.5.0-weekly.310
appVersion: r310
version: 5.5.0
appVersion: 2.14.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.5.0-weekly.310.
> **Note:** The documentation version is derived from the Helm chart version which is 5.5.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.5.0-weekly.310](https://img.shields.io/badge/Version-5.5.0--weekly.310-informational?style=flat-square) ![AppVersion: r310](https://img.shields.io/badge/AppVersion-r310-informational?style=flat-square)
![Version: 5.5.0](https://img.shields.io/badge/Version-5.5.0-informational?style=flat-square) ![AppVersion: 2.14.0](https://img.shields.io/badge/AppVersion-2.14.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: r310-e8ae03e
tag: 2.14.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 @@ -3862,7 +3862,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: r310-ad5d5b56
tag: v2.14.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