chore: Backport 15203 to release 3.2.x #15213

paul1r · 2024-12-02T21:27:48Z

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

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

(cherry picked from commit 5f670a4)

paul1r and others added 2 commits December 2, 2024 16:25

chore(deps): Move from base-nossl to static (#15203)

ba9cdf9

(cherry picked from commit 5f670a4)

Merge conflict resolution

a94e6b0

paul1r requested a review from a team as a code owner December 2, 2024 21:27

pull-request-size bot added the size/S label Dec 2, 2024

github-actions bot added the area/helm label Dec 2, 2024

trevorwhitney approved these changes Dec 2, 2024

View reviewed changes

paul1r merged commit 7293b0f into release-3.2.x Dec 2, 2024
61 of 62 checks passed

paul1r deleted the backport-15203-to-release-3.2.x branch December 2, 2024 21:34

Provide feedback