Skip to content

Conversation

@vrivellino
Copy link

@vrivellino vrivellino commented Oct 26, 2025

What this PR does / why we need it:

#13289 added a chart value (sidecar.rules.folderAnnotation) that sets FOLDER_ANNOTATION on the rules sidecar. However, it only sets that environment variable on loki-backend in SimpleScalable mode.

This PR sets FOLDER_ANNOTATION even in SIngleBinary and Distributed deployment modes

Which issue(s) this PR fixes:
N/A

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • [N/A] Documentation added
  • [N/A] 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.
  • [N/A] Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • [N/A] 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

@vrivellino vrivellino requested a review from a team as a code owner October 26, 2025 19:54
@CLAassistant
Copy link

CLAassistant commented Oct 26, 2025

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@Sheikh-Abubaker Sheikh-Abubaker left a comment

Choose a reason for hiding this comment

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

Looks good to me as the feature is extended to distributed and single-binary modes as well, @Jayclifford345 @JStickler could you please have a look ?

Entries should include a reference to the pull request that introduced the change.

## Unreleased
- [BUGFIX] Set `FOLDER_ANNOTATION` in Distributed and SingleBinary deployments. [#19593](https://github.com/grafana/loki/pull/19593)
Copy link
Contributor

@Sheikh-Abubaker Sheikh-Abubaker Nov 2, 2025

Choose a reason for hiding this comment

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

Suggested change
- [BUGFIX] Set `FOLDER_ANNOTATION` in Distributed and SingleBinary deployments. [#19593](https://github.com/grafana/loki/pull/19593)
- [ENHANCEMENT] Set `FOLDER_ANNOTATION` in Distributed and SingleBinary deployments. [#19593](https://github.com/grafana/loki/pull/19593)

I believe this could be categorised as enhancement ? since it's not really a bug rather extending the feature to the different deployment modes.

Copy link
Author

Choose a reason for hiding this comment

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

My reasoning was that the enhancement was #13289, but happy to switch the category - whatever you and other maintainers think

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants