Skip to content

feat(helm): Expose all storage configuration - #18509

Merged
JStickler merged 15 commits into
grafana:mainfrom
jkroepke:helm/storage-config
Aug 4, 2025
Merged

feat(helm): Expose all storage configuration#18509
JStickler merged 15 commits into
grafana:mainfrom
jkroepke:helm/storage-config

Conversation

@jkroepke

@jkroepke jkroepke commented Jul 20, 2025

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

This PR exposes all storage properties similar to #17597. It also adds an backwards compatibility layer to preserve old camelCase values naming.

It should also cover some PR related to exposing newer storage properties.

Which issue(s) this PR fixes:

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
@jkroepke
jkroepke requested a review from a team as a code owner July 20, 2025 08:52
@jkroepke
jkroepke force-pushed the helm/storage-config branch from d6e699e to 8efde0b Compare July 20, 2025 08:52
Comment thread production/helm/loki/templates/_helpers.tpl
Comment thread production/helm/loki/templates/_helpers.tpl Outdated
Comment thread production/helm/loki/templates/_helpers.tpl
Comment thread production/helm/loki/templates/_helpers.tpl Outdated
Comment thread production/helm/loki/templates/_helpers.tpl Outdated
Comment thread production/helm/loki/templates/_helpers.tpl
{{- if .Values.minio.enabled -}}
type: "s3"
s3:
bucketnames: ruler

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bucketnames: ruler
bucketnames: {{ .Values.loki.storage.bucketNames.ruler }}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, bucket names with internal minio deployment are hard-coded

buckets:
- name: chunks
policy: none
purge: false
- name: ruler
policy: none
purge: false
- name: admin
policy: none
purge: false

azure:
account_name: {{ .accountName }}
{{- toYaml (mergeOverwrite
dict

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not easily readable 🤔 Can we do it a bit differently? Maybe azure, gcs and s3 could be extracted into separate templates for better readibility?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please check this out if it meets your expectations

jkroepke and others added 5 commits July 23, 2025 20:28
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Co-authored-by: Quentin Bisson <quentin.bisson@gmail.com>
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
@jkroepke
jkroepke requested a review from QuentinBisson July 23, 2025 19:52
jkroepke and others added 2 commits July 23, 2025 21:52
Signed-off-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>
@Jayclifford345

Copy link
Copy Markdown
Contributor

Just kicking off the workflows for this one again. Thanks for your efforts here, both. Let me know when you are ready for it to be merged

Comment thread production/helm/loki/CHANGELOG.md
@QuentinBisson

Copy link
Copy Markdown
Contributor

LGTM, nice work @jkroepke

Comment thread production/helm/loki/CHANGELOG.md

@Jayclifford345 Jayclifford345 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Signed-off-by: J Stickler <julie.stickler@grafana.com>
@JStickler
JStickler merged commit db5e021 into grafana:main Aug 4, 2025
77 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4 participants