From f52235ef671f3686e527908af8d3b046c723bb2a Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Fri, 19 Apr 2024 11:32:18 +0200 Subject: [PATCH 1/3] feat: Enable log volume endpoint by default in helm --- production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- production/helm/loki/values.yaml | 7 +++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index a0ea01d6e279..ad796a850c3b 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,10 @@ 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.2.4 + +- [ENHANCEMENT] Activate the volume endpoint by default. + ## 6.2.3 - [ENHANCEMENT] Allow minio address to be overridden. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index f6e78b8ad7d7..e8b160550bc9 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 in simple, scalable mode type: application appVersion: 3.0.0 -version: 6.2.3 +version: 6.2.4 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 47213b2917e9..c892d1b4f364 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.2.3](https://img.shields.io/badge/Version-6.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.2.4](https://img.shields.io/badge/Version-6.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index aa5918cb9ffe..1c369ede11b4 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -304,6 +304,7 @@ loki: max_cache_freshness_per_query: 10m split_queries_by_interval: 15m query_timeout: 300s + volume_enabled: true # -- Provides a reloadable runtime configuration file for some specific configuration runtimeConfig: {} # -- Check https://grafana.com/docs/loki/latest/configuration/#common_config for more info on how to provide a common configuration @@ -1906,7 +1907,8 @@ distributor: # -- Node selector for distributor pods nodeSelector: {} # -- Tolerations for distributor pods - tolerations: [] + tolerations: + [] # -- Adds the appProtocol field to the distributor service. This allows distributor to work with istio protocol selection. appProtocol: # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" @@ -2773,7 +2775,8 @@ ruler: appProtocol: grpc: "" # -- Directories containing rules files - directories: {} + directories: + {} # tenant_foo: # rules1.txt: | # groups: From 755e8d277dd87831317e572bbf5abe38971ccd61 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Fri, 19 Apr 2024 11:35:10 +0200 Subject: [PATCH 2/3] documentation-helm-reference-check --- docs/sources/setup/install/helm/reference.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 40efb8ac5ddd..9d3e04fe9d8e 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -5250,7 +5250,8 @@ null "query_timeout": "300s", "reject_old_samples": true, "reject_old_samples_max_age": "168h", - "split_queries_by_interval": "15m" + "split_queries_by_interval": "15m", + "volume_enabled": true }, "memberlistConfig": {}, "memcached": { @@ -5594,7 +5595,8 @@ null "query_timeout": "300s", "reject_old_samples": true, "reject_old_samples_max_age": "168h", - "split_queries_by_interval": "15m" + "split_queries_by_interval": "15m", + "volume_enabled": true } From e396630d56dd7f3900100bbb5a5026ab05583859 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Fri, 19 Apr 2024 11:50:39 +0200 Subject: [PATCH 3/3] reformat correctly yaml --- production/helm/loki/values.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 1c369ede11b4..d9561ef72f84 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -1907,8 +1907,7 @@ distributor: # -- Node selector for distributor pods nodeSelector: {} # -- Tolerations for distributor pods - tolerations: - [] + tolerations: [] # -- Adds the appProtocol field to the distributor service. This allows distributor to work with istio protocol selection. appProtocol: # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" @@ -2775,8 +2774,7 @@ ruler: appProtocol: grpc: "" # -- Directories containing rules files - directories: - {} + directories: {} # tenant_foo: # rules1.txt: | # groups: