From f48e81c947faa221ba2c6c9114ec2784215c3a26 Mon Sep 17 00:00:00 2001 From: "loki-gh-app[bot]" <160051081+loki-gh-app[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 11:45:12 +0000 Subject: [PATCH 1/4] Update loki chart to 6.26.0 --- docs/sources/setup/install/helm/reference.md | 6 +++--- production/helm/loki/CHANGELOG.md | 3 +++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 4 ++-- 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 bf715ecaee898..951a998ceccd8 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -3063,7 +3063,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs", - "tag": "3.4.0" + "tag": "3.4.2" }, "license": { "contents": "NOTAVALIDLICENSE" @@ -3237,7 +3237,7 @@ null string Docker image tag 
-"3.4.0"
+"3.4.2"
@@ -6149,7 +6149,7 @@ null string Overrides the image tag whose default is the chart's appVersion 
-"3.4.1"
+"3.4.2"
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 1e499442e5aad..edfee58ca6ce7 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -24,6 +24,9 @@ Entries should include a reference to the pull request that introduced the chang ## 6.25.1 - [BUGFIX] Disable service monitor for nginx service. +## 6.26.0 + +- [CHANGE] Changed version of Grafana Loki to 3.4.2 ## 6.25.0 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 2f30be49fa6b0..53f9178d5d2ca 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -2,7 +2,7 @@ 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.4.0 +appVersion: 3.4.2 version: 6.26.0 home: https://grafana.github.io/helm-charts sources: diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 7acb331ba9084..4fae22a52bcb5 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.26.0](https://img.shields.io/badge/Version-6.26.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.0](https://img.shields.io/badge/AppVersion-3.4.0-informational?style=flat-square) +![Version: 6.26.0](https://img.shields.io/badge/Version-6.26.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.2](https://img.shields.io/badge/AppVersion-3.4.2-informational?style=flat-square) Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. @@ -15,7 +15,7 @@ Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, | Repository | Name | Version | |------------|------|---------| | https://charts.min.io/ | minio(minio) | 5.4.0 | -| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.1 | +| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.0 | | https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.23.0 | Find more information in the Loki Helm Chart [documentation](https://grafana.com/docs/loki/next/installation/helm). diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index f35d08ff91b5c..affc3426445f6 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -75,7 +75,7 @@ loki: # -- Docker image repository repository: grafana/loki # -- Overrides the image tag whose default is the chart's appVersion - tag: 3.4.1 + tag: 3.4.2 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -577,7 +577,7 @@ enterprise: # -- Docker image repository repository: grafana/enterprise-logs # -- Docker image tag - tag: 3.4.0 + tag: 3.4.2 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy From fb89d2d6be53e7a645d8cf202090da53e807e532 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Fri, 14 Feb 2025 15:22:15 -0700 Subject: [PATCH 2/4] fix: release as 6.27.0 --- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 53f9178d5d2ca..28a1e216ad6d0 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.4.2 -version: 6.26.0 +version: 6.27.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 4fae22a52bcb5..0bb567b106389 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.26.0](https://img.shields.io/badge/Version-6.26.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.2](https://img.shields.io/badge/AppVersion-3.4.2-informational?style=flat-square) +![Version: 6.27.0](https://img.shields.io/badge/Version-6.27.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.2](https://img.shields.io/badge/AppVersion-3.4.2-informational?style=flat-square) Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes. @@ -15,7 +15,7 @@ Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, | Repository | Name | Version | |------------|------|---------| | https://charts.min.io/ | minio(minio) | 5.4.0 | -| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.0 | +| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.1 | | https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.23.0 | Find more information in the Loki Helm Chart [documentation](https://grafana.com/docs/loki/next/installation/helm). From a5fc9f4c9e6e38ced68787aa30bc2cf23f7e9363 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Fri, 14 Feb 2025 15:26:39 -0700 Subject: [PATCH 3/4] feat: bump GEL to 3.4.0 --- docs/sources/setup/install/helm/reference.md | 6 +++--- production/helm/loki/CHANGELOG.md | 3 +++ production/helm/loki/values.yaml | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 951a998ceccd8..9195794112a07 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -3063,7 +3063,7 @@ null "pullPolicy": "IfNotPresent", "registry": "docker.io", "repository": "grafana/enterprise-logs", - "tag": "3.4.2" + "tag": "3.4.0" }, "license": { "contents": "NOTAVALIDLICENSE" @@ -3117,7 +3117,7 @@ null "tolerations": [] }, "useExternalLicense": false, - "version": "3.1.1" + "version": "3.4.0" } @@ -3237,7 +3237,7 @@ null string Docker image tag 
-"3.4.2"
+"3.4.0"
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index edfee58ca6ce7..594a1c0ec7851 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,9 +13,12 @@ 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.27.0 + - [FEATURE] Added support for globals: `extraArgs`, `extraEnv`, `extraEnvFrom`, `extraVolumes`, `extraVolumeMounts` ([#16062](https://github.com/grafana/loki/pull/16062)) relates to ([#12652](https://github.com/grafana/loki/pull/12652)) - [CHANGE] Changed version of Memcached image to 1.6.36 - [CHANGE] Changed version of Grafana Loki to 3.4.1 +- [CHANGE] Changed version of Grafana Enterprise Logs to 3.4.0 ## 6.26.0 diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index affc3426445f6..443d2f7d796c6 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -535,7 +535,7 @@ enterprise: # Enable enterprise features, license must be provided enabled: false # Default verion of GEL to deploy - version: 3.1.1 + version: 3.4.0 # -- Optional name of the GEL cluster, otherwise will use .Release.Name # The cluster name must match what is in your GEL license cluster_name: null @@ -577,7 +577,7 @@ enterprise: # -- Docker image repository repository: grafana/enterprise-logs # -- Docker image tag - tag: 3.4.2 + tag: 3.4.0 # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy From 27ba981359b34c8710ac2ec749c7f2eecf218516 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Fri, 14 Feb 2025 15:33:23 -0700 Subject: [PATCH 4/4] fix: helm changelog headers --- production/helm/loki/CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 594a1c0ec7851..7bd0aaf346359 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -17,7 +17,7 @@ Entries should include a reference to the pull request that introduced the chang - [FEATURE] Added support for globals: `extraArgs`, `extraEnv`, `extraEnvFrom`, `extraVolumes`, `extraVolumeMounts` ([#16062](https://github.com/grafana/loki/pull/16062)) relates to ([#12652](https://github.com/grafana/loki/pull/12652)) - [CHANGE] Changed version of Memcached image to 1.6.36 -- [CHANGE] Changed version of Grafana Loki to 3.4.1 +- [CHANGE] Changed version of Grafana Loki to 3.4.2 - [CHANGE] Changed version of Grafana Enterprise Logs to 3.4.0 ## 6.26.0 @@ -27,9 +27,6 @@ Entries should include a reference to the pull request that introduced the chang ## 6.25.1 - [BUGFIX] Disable service monitor for nginx service. -## 6.26.0 - -- [CHANGE] Changed version of Grafana Loki to 3.4.2 ## 6.25.0