diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md index 31b3006a84eb9..40452810c9cf3 100644 --- a/docs/sources/setup/install/helm/reference.md +++ b/docs/sources/setup/install/helm/reference.md @@ -6090,6 +6090,9 @@ null "signatureVersion": null }, "swift": { + "application_credential_id": null, + "application_credential_name": null, + "application_credential_secret": null, "auth_url": null, "auth_version": null, "connect_timeout": null, diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 6052b517068ae..ae63ccf0b59c9 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -19,6 +19,9 @@ Entries should include a reference to the pull request that introduced the chang - [FIX] Do not create bloom planner, bloom builder, bloom gateway Deployment/Statefulset if their replica count is 0. - [FIX] Configure (ephemeral) storage for bloom builder working directory - [ENHANCEMENT] Automatically configure bloom planner address for bloom builders and bloom gateway addresses for bloom gateway clients. +## 6.12.1 + +- [ENHANCEMENT] Add support for OpenStack application credentials when using Swift for storage ## 6.12.0 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index e3143c14fa041..10efb22b0afb1 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.1.1 -version: 6.13.0 +version: 6.13.1 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 1781a0043b854..9b9796b92879d 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 6.13.0](https://img.shields.io/badge/Version-6.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square) +![Version: 6.13.1](https://img.shields.io/badge/Version-6.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.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/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl index 9a4ab135db922..eec87087e7ae2 100644 --- a/production/helm/loki/templates/_helpers.tpl +++ b/production/helm/loki/templates/_helpers.tpl @@ -377,6 +377,15 @@ azure: {{- else if eq .Values.loki.storage.type "swift" -}} {{- with .Values.loki.storage.swift }} swift: + {{- with .application_credential_id }} + application_credential_id: {{ . }} + {{- end }} + {{- with .application_credential_name }} + application_credential_name: {{ . }} + {{- end }} + {{- with .application_credential_secret }} + application_credential_secret: {{ . }} + {{- end }} {{- with .auth_version }} auth_version: {{ . }} {{- end }} @@ -384,7 +393,9 @@ swift: {{- with .internal }} internal: {{ . }} {{- end }} - username: {{ .username }} + {{- with .username }} + username: {{ . }} + {{- end }} user_domain_name: {{ .user_domain_name }} {{- with .user_domain_id }} user_domain_id: {{ . }} @@ -392,7 +403,9 @@ swift: {{- with .user_id }} user_id: {{ . }} {{- end }} - password: {{ .password }} + {{- with .password }} + password: {{ . }} + {{- end }} {{- with .domain_id }} domain_id: {{ . }} {{- end }} @@ -461,6 +474,15 @@ storage: {{- with .Values.loki.storage.swift }} backend: "swift" swift: + {{- with .application_credential_id }} + application_credential_id: {{ . }} + {{- end }} + {{- with .application_credential_name }} + application_credential_name: {{ . }} + {{- end }} + {{- with .application_credential_secret }} + application_credential_secret: {{ . }} + {{- end }} {{- with .auth_version }} auth_version: {{ . }} {{- end }} @@ -468,7 +490,9 @@ storage: {{- with .internal }} internal: {{ . }} {{- end }} - username: {{ .username }} + {{- with .username }} + username: {{ . }} + {{- end }} user_domain_name: {{ .user_domain_name }} {{- with .user_domain_id }} user_domain_id: {{ . }} @@ -476,7 +500,9 @@ storage: {{- with .user_id }} user_id: {{ . }} {{- end }} - password: {{ .password }} + {{- with .password }} + password: {{ . }} + {{- end }} {{- with .domain_id }} domain_id: {{ . }} {{- end }} diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 0f0e4e2afd18c..e8fdfe892d947 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -354,6 +354,9 @@ loki: requestTimeout: null endpointSuffix: null swift: + application_credential_id: null + application_credential_name: null + application_credential_secret: null auth_version: null auth_url: null internal: null