Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bitnami/grafana-loki] Add overrideConfiguration to override templated loki configuration #12417

Merged
merged 4 commits into from
Sep 14, 2022

Conversation

k-jingyang
Copy link
Contributor

Description of the change

Introduces .loki.overrideConfiguration which allows users to specify specific configuration overrides via yaml. This augments the sane defaults provided in loki.configuration of the current values.yaml

E.g.

loki:
  configuration: |
    auth_enabled: false
    ...
  overrideConfiguration:
    auth_enabled: true

will yield the following in grafana-loki/templates/loki-configmap.yaml

data:
  loki.yaml: |-
    auth_enabled: true

Benefits

This allows better customization of Loki"s configuration while making use of the sane defaults provided.

Possible drawbacks

Long and complex Helm templating.

{{- mergeOverwrite (include "common.tplvalues.render" (dict "value" .Values.loki.configuration "context" $) | fromYaml) .Values.loki.overrideConfiguration | toYaml | nindent 4 }}

Any better ideas?

Applicable issues

Resolves #12400

Additional information

Checklist

  • Chart version bumped in Chart.yaml according to semver. This is not necessary when the changes only affect README.md files.
  • Variables are documented in the values.yaml and added to the README.md using readme-generator-for-helm
  • Title of the pull request follows this pattern [bitnami/<name_of_the_chart>] Descriptive title
  • All commits signed off and in agreement of Developer Certificate of Origin (DCO)

@bitnami-bot bitnami-bot requested a review from fmulero September 14, 2022 03:44
@github-actions github-actions bot added the triage Triage is needed label Sep 14, 2022
@k-jingyang k-jingyang changed the title [bitnami/loki] Add overrideConfiguration to override templated loki configuration [bitnami/grafana-loki] Add overrideConfiguration to override templated loki configuration Sep 14, 2022
@bitnami-bot bitnami-bot removed the request for review from fmulero September 14, 2022 07:24
@github-actions github-actions bot added in-progress and removed triage Triage is needed labels Sep 14, 2022
@fmulero fmulero added the verify Execute verification workflow for these changes label Sep 14, 2022
Copy link
Contributor

@marcosbc marcosbc left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for the contribution!

@marcosbc marcosbc merged commit 4c5ba40 into bitnami:master Sep 14, 2022
@k-jingyang
Copy link
Contributor Author

LGTM! Thanks for the contribution!

Thanks for reviewing!

@github-actions github-actions bot added triage Triage is needed and removed solved labels Sep 14, 2022
@github-actions github-actions bot removed the triage Triage is needed label Sep 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
grafana-loki solved verify Execute verification workflow for these changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bitnami/grafana-loki] Better customization of Loki"s configuration
4 participants