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.

Sign up for GitHub

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

Jump to bottom

Promtil: Fix a panic when using the loki push api target. #5761

Merged
merged 1 commit into from
Apr 4, 2022
Merged

Promtil: Fix a panic when using the loki push api target. #5761

merged 1 commit into from
Apr 4, 2022

Conversation

slim-bean
Copy link
Collaborator

What this PR does / why we need it:

We were passing in the active metrics registry to the util tool that sets up the logger to be used by the push server, this resulted in a duplicate metrics registration.

The metric being registered is not important so this PR just passes in an empty registry to use to init the logger.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

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

@slim-bean
use an empty registry when setting up the logger for the push server
c0a7d0f 
Signed-off-by: Ed Welch <edward.welch@grafana.com>
@slim-bean slim-bean requested a review from a team as a code owner April 4, 2022 12:45
@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 4, 2022
@owen-d owen-d merged commit a9ac01b into main Apr 4, 2022
@owen-d owen-d deleted the fix-metric-registry branch April 4, 2022 13:16
grafanabot pushed a commit that referenced this pull request Apr 4, 2022
@slim-bean @grafanabot
use an empty registry when setting up the logger for the push server (#…
97410a9 
…5761)

Signed-off-by: Ed Welch <edward.welch@grafana.com>
(cherry picked from commit a9ac01b)
@grafanabot grafanabot mentioned this pull request Apr 4, 2022
Merged
slim-bean added a commit that referenced this pull request Apr 6, 2022
@grafanabot @slim-bean
use an empty registry when setting up the logger for the push server (#…
502347d 
…5761) (#5762)

Signed-off-by: Ed Welch <edward.welch@grafana.com>
(cherry picked from commit a9ac01b)

Co-authored-by: Ed Welch <edward.welch@grafana.com>
splitice pushed a commit to X4BNet/loki that referenced this pull request May 21, 2022
@grafanabot @slim-bean @splitice
use an empty registry when setting up the logger for the push server (g…
ef02a3d 
…rafana#5761) (grafana#5762)

Signed-off-by: Ed Welch <edward.welch@grafana.com>
(cherry picked from commit a9ac01b)

Co-authored-by: Ed Welch <edward.welch@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@owen-d owen-d owen-d approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@slim-bean @owen-d