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

fix(promtail): Fix UDP receiver on syslog transport #10708

Merged
merged 3 commits into from
Apr 22, 2024

Conversation

joshuapare
Copy link
Contributor

Simple fix to convert the incoming datagram into a bytes reader that the ParseStream can handle. currently it freezes up because the datagrams are sent as is without separation so the reader routine blocks until an interrupt.

Issue first resolved in grafana/agent, mirror PR to that: grafana/agent#5297

Fixes #6772

Checklist

@joshuapare joshuapare requested a review from a team as a code owner September 26, 2023 02:13
@joshuapare joshuapare changed the title ensure syslog parser gets an EOF-terminated reader on udp receive Fix UDP reciever on syslog parser Sep 26, 2023
@joshuapare joshuapare changed the title Fix UDP reciever on syslog parser Fix UDP reciever on syslog transport Sep 26, 2023
@joshuapare joshuapare changed the title Fix UDP reciever on syslog transport Fix UDP receiver on syslog transport Sep 26, 2023
@CLAassistant
Copy link

CLAassistant commented Sep 26, 2023

CLA assistant check
All committers have signed the CLA.

@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@cstyan
Copy link
Contributor

cstyan commented Nov 16, 2023

@joshuapare looks like there's some test failures + a merge conflict with the changelog. Assigning myself as reviewer.

@cstyan cstyan self-assigned this Nov 16, 2023
@cstyan cstyan changed the title Fix UDP receiver on syslog transport fix(promtail): Fix UDP receiver on syslog transport Apr 12, 2024
@cstyan
Copy link
Contributor

cstyan commented Apr 15, 2024

@joshuapare we can move forward here, no issues with the promtail maintenance mode bit. Is there any easy openings for tests here? I'm not very familiar with syslog so I don't know why the reading from the wire needs to be read in this manner to handle UDP.

@joshuapare
Copy link
Contributor Author

joshuapare commented Apr 21, 2024

@cstyan Unfortunately not - in the other repo, it was deemed simple enough to merge in, so I assume it would follow the same pattern here: grafana/agent#5297 (review)

@cstyan
Copy link
Contributor

cstyan commented Apr 22, 2024

@cstyan Unfortunately not - in the other repo, it was deemed simple enough to merge in, so I assume it would follow the same pattern here: grafana/agent#5297 (review)

fair enough, the agent/alloy team would have worked with this part of the code more recently anyways 👍 lets see if CI is still green, then we can merge

@cstyan
Copy link
Contributor

cstyan commented Apr 22, 2024

@joshuapare thanks for your patience 👍

@cstyan cstyan merged commit a00f1f1 into grafana:main Apr 22, 2024
14 checks passed
@joshuapare
Copy link
Contributor Author

@cstyan Same to you! I should have checked back far sooner 😅 thanks for getting this in

@joshuapare joshuapare deleted the fix-syslog-transport branch April 23, 2024 13:44
mattgialelis pushed a commit to mattgialelis/loki that referenced this pull request Apr 23, 2024
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.

Promtail: syslog job over UDP is not working
3 participants