From e061540e0d88af465badfdda0c214f39a25d068a Mon Sep 17 00:00:00 2001 From: Dean Daskalantonakis Date: Tue, 16 Apr 2024 15:12:17 -0500 Subject: [PATCH 1/6] remove duplicate bucketNames documentation --- docs/sources/setup/install/helm/install-monolithic/_index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/sources/setup/install/helm/install-monolithic/_index.md b/docs/sources/setup/install/helm/install-monolithic/_index.md index fcd9e66716256..6a8615f847b2c 100644 --- a/docs/sources/setup/install/helm/install-monolithic/_index.md +++ b/docs/sources/setup/install/helm/install-monolithic/_index.md @@ -80,10 +80,6 @@ If you set the `singleBinary.replicas` value to 2 or more, this chart configures object_store: filesystem schema: v13 storage: - bucketNames: - chunks: loki-chunks - ruler: loki-ruler - admin: loki-admin type: 's3' bucketNames: chunks: loki-chunks From 17f538c6a87bfb9b34e5a950bd93f4f6d6dc310d Mon Sep 17 00:00:00 2001 From: Dean Daskalantonakis Date: Tue, 16 Apr 2024 15:32:43 -0500 Subject: [PATCH 2/6] Bugfix typo in deploymentMode documentation --- docs/sources/setup/install/helm/install-monolithic/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/setup/install/helm/install-monolithic/_index.md b/docs/sources/setup/install/helm/install-monolithic/_index.md index 6a8615f847b2c..f74745c43f183 100644 --- a/docs/sources/setup/install/helm/install-monolithic/_index.md +++ b/docs/sources/setup/install/helm/install-monolithic/_index.md @@ -39,7 +39,7 @@ If you set the `singleBinary.replicas` value to 2 or more, this chart configures - If running a single replica of Loki, configure the `filesystem` storage: ```yaml - mode: SingleBinary + deploymentMode: SingleBinary loki: commonConfig: replication_factor: 1 From 6085d097fdf315bce3959c153bc7205f0575293c Mon Sep 17 00:00:00 2001 From: Dean Daskalantonakis Date: Tue, 16 Apr 2024 16:19:00 -0500 Subject: [PATCH 3/6] Set object_store to s3 when specified --- docs/sources/setup/install/helm/install-monolithic/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/setup/install/helm/install-monolithic/_index.md b/docs/sources/setup/install/helm/install-monolithic/_index.md index f74745c43f183..86344a9488d77 100644 --- a/docs/sources/setup/install/helm/install-monolithic/_index.md +++ b/docs/sources/setup/install/helm/install-monolithic/_index.md @@ -77,7 +77,7 @@ If you set the `singleBinary.replicas` value to 2 or more, this chart configures index: prefix: loki_index_ period: 24h - object_store: filesystem + object_store: s3 schema: v13 storage: type: 's3' From be8a3d80b180f3db96064fb23adaaf244685041c Mon Sep 17 00:00:00 2001 From: Dean Daskalantonakis Date: Tue, 16 Apr 2024 17:37:52 -0500 Subject: [PATCH 4/6] Bump Chart Version --- production/helm/loki/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 413444160fa22..cd1abdde0abdb 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.0 +version: 6.2.1 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki From 70d6a5f42b5f51adc18f1475d3edb9362422c6f0 Mon Sep 17 00:00:00 2001 From: Dean Daskalantonakis Date: Tue, 16 Apr 2024 17:39:35 -0500 Subject: [PATCH 5/6] Update CHANGELOG.md --- production/helm/loki/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index b3673def27fef..5b7cb1905bdb5 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.1 + +- [BUGFIX] Removed duplicate bucketNames from documentation and fixed key name `deploymentMode` + ## 6.2.0 - [FEATURE] Add a headless service to the bloom gateway component. From 7f2169c4d68fa26c844d8eff1fbfb34710e38cde Mon Sep 17 00:00:00 2001 From: Dean Daskalantonakis Date: Tue, 16 Apr 2024 17:40:15 -0500 Subject: [PATCH 6/6] Update README.md version --- production/helm/loki/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 578548edb8d7f..7bde283b2dff7 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.2.0](https://img.shields.io/badge/Version-6.2.0-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.1](https://img.shields.io/badge/Version-6.2.1-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