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

Update Loki and sync some of the Promtail code #836

Merged
merged 2 commits into from
May 14, 2024
Merged

Conversation

ptodev
Copy link
Contributor

@ptodev ptodev commented May 13, 2024

Two bug fixes were made in Promtail recently:

  1. Clean up metrics generated from logs after a config reload
  2. Fix bug with Promtail config reloading getting stuck indefinitely

I think both of these fixes only really impact static mode, but I'd prefer if I update Alloy first and backport to Agent, so that Alloy is not more out of date.

For the first issue I just tested Flow mode and Alloy, and it seems like the bug is still there for them and I need to fix it separately.

@ptodev ptodev marked this pull request as ready for review May 13, 2024 17:18
@ptodev ptodev added the backport-to-agent PR should be backported to the agent repo. label May 13, 2024
@mattdurham
Copy link
Collaborator

Are the Loki stages straight copies of the promtail changes?

@thampiotr
Copy link
Contributor

Are the Loki stages straight copies of the promtail changes?

As far as I remember, they're not, there are some changes to the constructor etc, but they are functionally equivalent and relatively easy to map between each other.

Copy link
Contributor

@thampiotr thampiotr 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!

@thampiotr thampiotr merged commit dd1ccf6 into main May 14, 2024
19 checks passed
@thampiotr thampiotr deleted the ptodev/update-loki branch May 14, 2024 15:12
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport-to-agent PR should be backported to the agent repo. frozen-due-to-age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants