loki
loki copied to clipboard
feat: add FOLDER_ANNOTATATION logic for sidecar container in loki helm chart, making multi-tenant alerting easier
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.mdguide (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,
featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
- Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such,
- [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.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PR - [x] If the change is deprecating or removing a configuration option, update the
deprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR
@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
@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
Thank you, changed as well
Thank you! When can we expect this to get merged?
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.