Skip to content

feat(helm): add FOLDER_ANNOTATATION logic for sidecar container in loki helm chart, making multi-tenant alerting easier - #13289

Merged
Jayclifford345 merged 3 commits into
grafana:mainfrom
SamuZad:main
Jul 22, 2025
Merged

Conversation

@SamuZad

@SamuZad SamuZad commented Jun 22, 2024

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:
The sidecar container is super convenient for adding (alerting) rules to loki.

However, as things stand, all files are mounted into the same directory, with no convenient way to separate them by tenant.

Luckily, the sidecar image already has a built-in environment variable for this, FOLDER_ANNOTATION. This PR implements the environment variable into the pod definition, in a manner consistent with other env variables within the chart.

Which issue(s) this PR fixes:
Fixes #13049

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
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • 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
@SamuZad
SamuZad requested a review from a team as a code owner June 22, 2024 23:23
@CLAassistant

CLAassistant commented Jun 22, 2024

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@SamuZad SamuZad changed the title feat: add FOLDER_ANNOTATATION logic for loki helm chart sidecar, making multi-tenant alerting easier Jun 22, 2024
@SamuZad

SamuZad commented Jun 13, 2025

Copy link
Copy Markdown
Contributor Author

@slim-bean - apologies for the direct tag, but any chance this could get some attention?

The PR has been open for a year, and the issue is still very much relevant, and the fix seems relatively non-controversial.

I'd be happy to rebase or do whatever else is needed to get this merged

@JStickler
JStickler requested a review from Jayclifford345 June 13, 2025 19:28

@jkroepke jkroepke 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.

Hi @SamuZad

thanks for your PR and sorry for waiting long time. I go through the review and the use-case seems valid to me. I added some suggestions, because bump versions is not longer part of the PR.

please change the PR title to feat(helm) and
rebase/update the PR.

Thanks.

Comment thread production/helm/loki/CHANGELOG.md Outdated
Comment thread production/helm/loki/Chart.yaml Outdated
Comment thread production/helm/loki/README.md Outdated
Comment thread production/helm/loki/CHANGELOG.md Outdated
Comment thread production/helm/loki/values.yaml Outdated
@SamuZad SamuZad changed the title feat: add FOLDER_ANNOTATATION logic for sidecar container in loki helm chart, making multi-tenant alerting easier Jul 18, 2025
@SamuZad

SamuZad commented Jul 18, 2025

Copy link
Copy Markdown
Contributor Author

@jkroepke thank you for the feedback! I've made the changes you've asked for. Please let me know if I need to do anything else

@jkroepke jkroepke 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, just the Changelog entry.

Comment thread production/helm/loki/CHANGELOG.md Outdated
@SamuZad

SamuZad commented Jul 19, 2025

Copy link
Copy Markdown
Contributor Author

Thank you, changed as well

@jkroepke jkroepke 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

@SamuZad

SamuZad commented Jul 21, 2025

Copy link
Copy Markdown
Contributor Author

Thank you! When can we expect this to get merged?

@jkroepke

Copy link
Copy Markdown
Contributor

There is a merge wave each Friday/Monday with an limited amount of merges. I guess in this PR is in the next wave included. Generally, this PR is on the internal tracking list.

@Jayclifford345
Jayclifford345 merged commit 833fcbc into grafana:main Jul 22, 2025
75 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

5 participants