From 3e92848d97be01a708fe4a92c1eb6c0c92a83183 Mon Sep 17 00:00:00 2001 From: "loki-gh-app[bot]" Date: Wed, 4 Dec 2024 22:08:46 +0000 Subject: [PATCH 1/5] Update loki chart to 6.20.0 --- docs/sources/setup/install/helm/reference.md | 6 +++--- production/helm/loki/CHANGELOG.md | 3 +++ production/helm/loki/Chart.yaml | 4 ++-- production/helm/loki/README.md | 2 +- production/helm/loki/values.yaml | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 5dfd74ea279d2..c60b042732cd4 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -3062,7 +3062,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs", - "tag": "3.3.0" + "tag": "3.3.1" }, "license": { "contents": "NOTAVALIDLICENSE" @@ -3235,7 +3235,7 @@ null string Docker image tag 
-"3.3.0"
+"3.3.1"
@@ -6090,7 +6090,7 @@ null string Overrides the image tag whose default is the chart's appVersion 
-"3.3.0"
+"3.3.1"
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index eac1c61615101..1eb2be5607c0f 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -18,6 +18,9 @@ Entries should include a reference to the pull request that introduced the chang ## 6.20.0 - [CHANGE] Changed version of Grafana Loki to 3.3.0 +## 6.20.0 + +- [CHANGE] Changed version of Grafana Loki to 3.3.1 ## 6.19.0-weekly.227 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index ce11a1a5c2c4f..e021a942d69ac 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: loki description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. type: application -appVersion: 3.3.0 -version: 6.22.0 +appVersion: 3.3.1 +version: 6.20.0 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 6651f00748afb..9cb3f4ed955ef 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.22.0](https://img.shields.io/badge/Version-6.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.0](https://img.shields.io/badge/AppVersion-3.3.0-informational?style=flat-square) +![Version: 6.20.0](https://img.shields.io/badge/Version-6.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 78961a7243009..baa58607f28c7 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -56,7 +56,7 @@ loki: # -- Docker image repository repository: grafana/loki # -- Overrides the image tag whose default is the chart's appVersion - tag: 3.3.0 + tag: 3.3.1 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -518,7 +518,7 @@ enterprise: # -- Docker image repository repository: grafana/enterprise-logs # -- Docker image tag - tag: 3.3.0 + tag: 3.3.1 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy From 119a8dc9581315d360fcc36166311253b8f6ee05 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Thu, 5 Dec 2024 10:35:54 -0700 Subject: [PATCH 2/5] fix: version --- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index e021a942d69ac..07da087c8306e 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. type: application appVersion: 3.3.1 -version: 6.20.0 +version: 6.23.0 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 9cb3f4ed955ef..9c8a8129fc703 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.20.0](https://img.shields.io/badge/Version-6.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) +![Version: 6.23.0](https://img.shields.io/badge/Version-6.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.0](https://img.shields.io/badge/AppVersion-3.3.0-informational?style=flat-square) Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. From 9cb1319116730c66c3b1a67a75b8f43ab9f0771b Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Thu, 5 Dec 2024 10:38:38 -0700 Subject: [PATCH 3/5] docs: update changelog --- production/helm/loki/CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 1eb2be5607c0f..20232460b7e0d 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,14 +13,17 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.) +## 6.23.0 + +- [CHANGE] Changed version of Grafana Loki to 3.3.1 + ## 6.22.0 -## 6.20.0 +## 6.21.0 -- [CHANGE] Changed version of Grafana Loki to 3.3.0 ## 6.20.0 -- [CHANGE] Changed version of Grafana Loki to 3.3.1 +- [CHANGE] Changed version of Grafana Loki to 3.3.0 ## 6.19.0-weekly.227 From a65f77ea21c24410b3f3a22e7393bfbb8a1746bf Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Thu, 5 Dec 2024 10:55:24 -0700 Subject: [PATCH 4/5] docs: fix changelog --- production/helm/loki/CHANGELOG.md | 2 +- production/helm/loki/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 8bfba37f89641..c11877ebbb9e1 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,11 +13,11 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.) - [CHANGE] Changed version of Minio helm chart to 5.3.0 (#14834) +- [BUGFIX] Add default wal dir to ruler config ([#14920](https://github.com/grafana/loki/pull/14920)) ## 6.23.0 - [CHANGE] Changed version of Grafana Loki to 3.3.1 -- [BUGFIX] Add default wal dir to ruler config ([#14920](https://github.com/grafana/loki/pull/14920)) ## 6.22.0 diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 2a7c636573661..bbc39ed7c4bef 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.23.0](https://img.shields.io/badge/Version-6.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.0](https://img.shields.io/badge/AppVersion-3.3.0-informational?style=flat-square) +![Version: 6.23.0](https://img.shields.io/badge/Version-6.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.3.1](https://img.shields.io/badge/AppVersion-3.3.1-informational?style=flat-square) Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. From de8bf1ce1a01a4a8300a58220f79a683bfa139b0 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Thu, 5 Dec 2024 10:57:55 -0700 Subject: [PATCH 5/5] docs: fix changelog again --- production/helm/loki/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index c11877ebbb9e1..dfc51d67d0a42 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -12,12 +12,12 @@ Entries should be ordered as follows: Entries should include a reference to the pull request that introduced the change. [//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.) -- [CHANGE] Changed version of Minio helm chart to 5.3.0 (#14834) -- [BUGFIX] Add default wal dir to ruler config ([#14920](https://github.com/grafana/loki/pull/14920)) ## 6.23.0 - [CHANGE] Changed version of Grafana Loki to 3.3.1 +- [CHANGE] Changed version of Minio helm chart to 5.3.0 (#14834) +- [BUGFIX] Add default wal dir to ruler config ([#14920](https://github.com/grafana/loki/pull/14920)) ## 6.22.0