loki icon indicating copy to clipboard operation
loki copied to clipboard

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

Open SamuZad opened this issue 1 year ago • 2 comments

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

  • [x] Reviewed the CONTRIBUTING.md guide (required)
  • [x] Documentation added
  • [x] Tests updated
  • [x] 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.
  • [x] Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • [x] 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
  • [x] 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 avatar Jun 22 '24 23:06 SamuZad

CLA assistant check
All committers have signed the CLA.

CLAassistant avatar Jun 22 '24 23:06 CLAassistant

@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

SamuZad avatar Jun 13 '25 05:06 SamuZad

@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

SamuZad avatar Jul 18 '25 21:07 SamuZad

Thank you, changed as well

SamuZad avatar Jul 19 '25 09:07 SamuZad

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

SamuZad avatar Jul 21 '25 09:07 SamuZad

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.

jkroepke avatar Jul 22 '25 06:07 jkroepke