Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promtail: Rename config name limit_config to limits_config #5707

Merged
merged 3 commits into from
Mar 24, 2022
Merged

Promtail: Rename config name limit_config to limits_config #5707

merged 3 commits into from
Mar 24, 2022

Conversation

franzwong
Copy link
Contributor

@franzwong franzwong commented Mar 24, 2022

What this PR does / why we need it:
Make configuration name consistent

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

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated
  • Add an entry in the CHANGELOG.md about the changes.

@franzwong franzwong requested a review from a team as a code owner March 24, 2022 02:48
@CLAassistant
Copy link

CLAassistant commented Mar 24, 2022

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

@kavirajk kavirajk left a comment

Choose a reason for hiding this comment

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

LGTM. thanks @franzwong

@kavirajk
Copy link
Collaborator

Merging this PR as the original config limit_config is not part of public release yet. So no need to be backward compatible.
(also checked and made sure that we don't use this config anywhere internally )

@kavirajk kavirajk merged commit d67306b into grafana:main Mar 24, 2022
@franzwong franzwong deleted the rename-limit-config branch March 25, 2022 02:54
@slim-bean slim-bean added the backport release-2.5.x Tag a PR with this label to create a PR which cherry pics it into the release-2.5.x branch label Apr 6, 2022
@grafanabot
Copy link
Collaborator

The backport to release-2.5.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-5707-to-release-2.5.x origin/release-2.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x d67306b657c10c6c6d19fec6855ef7babfc48755
# Push it to GitHub
git push --set-upstream origin backport-5707-to-release-2.5.x
git switch main
# Remove the local backport branch
git branch -D backport-5707-to-release-2.5.x

Then, create a pull request where the base branch is release-2.5.x and the compare/head branch is backport-5707-to-release-2.5.x.

slim-bean pushed a commit that referenced this pull request Apr 6, 2022
* Rename promtail config name 'limit_config' to 'limits_config'

* Add changelog entry

* Fix formatting

(cherry picked from commit d67306b)
slim-bean added a commit that referenced this pull request Apr 6, 2022
…5788)

* Rename promtail config name 'limit_config' to 'limits_config'

* Add changelog entry

* Fix formatting

(cherry picked from commit d67306b)

Co-authored-by: Franz Wong <franzwong@gmail.com>
splitice pushed a commit to X4BNet/loki that referenced this pull request May 21, 2022
) (grafana#5788)

* Rename promtail config name 'limit_config' to 'limits_config'

* Add changelog entry

* Fix formatting

(cherry picked from commit d67306b)

Co-authored-by: Franz Wong <franzwong@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-2.5.x Tag a PR with this label to create a PR which cherry pics it into the release-2.5.x branch size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make configuration name consistent
5 participants