Stop reading from /proc/sys/kernel/osrelease at trailing newline#9374
Conversation
Manage this branch in SquashTest this branch here: https://sjuxaxosrelease-newline-n4ikd.squash.io |
|
|
|
@netdata/agent ☝️ |
thiagoftsm
left a comment
thiagoftsm
left a comment
There was a problem hiding this comment.
I used the command hexdump -C /proc/sys/kernel/osrelease on Slackware Current and CentOS 8 and I observed that on both distributions it is safety to stop read when a 0a character is found.
I also tested your PR on the following environments:
- Slackware current (kernel 5.7.2)
- Slackware current (kernel 5.4.47)
- Debian 10.4 (kernel 4.19.118-2 )
- CentOS 8 (Kernel 4.18.0-193.6.3.el8_2.x86_64 )
- Slackware current (kernel 4.16.18)
- Slackware current (kernel 4.14.184)
- CentOS 7.8 ( kernel 3.10.0-1127)
and everything worked as expected.
Thank you very much @sjuxax !
|
np, thanks for the reviews everyone. Was a little bummed to see this didn't get merged into 1.23, especially since eBPF is one of the release's major headlines. Is there something else I need to do before the PR can be merged? No big deal if this was patched through something else of course, would just be good to notate here for the record. Thanks! |
|
@sjuxax you seem to have 2 approving reviews already so probable reason why it didn't get merged is only the current code freeze (which is active few days pre/post release) |
|
Hi @sjuxax , I am sorry, I forgot to give you an explanation about the code freeze, but as soon it finishes we will merge your PR. best regards! |
* [ci skip] create nightly packages and update changelog * [Package amd64 DEB][Build latest] Package build process trigger * [Package i386 DEB][Build latest] Package build process trigger * [Package amd64 RPM][Build latest] Package build process trigger * Stop reading from /proc/sys/kernel/osrelease at trailing newline. (#9374) Remove new line that was creating wrong log information. * fixed typo Co-authored-by: netdatabot <bot@netdata.cloud> Co-authored-by: Jeff Cook <jeff@jeffcook.io>
joelhans
changed the title
* [ci skip] create nightly packages and update changelog * [Package amd64 DEB][Build latest] Package build process trigger * [Package i386 DEB][Build latest] Package build process trigger * [Package amd64 RPM][Build latest] Package build process trigger * Stop reading from /proc/sys/kernel/osrelease at trailing newline. (netdata#9374) Remove new line that was creating wrong log information. * fixed typo Co-authored-by: netdatabot <bot@netdata.cloud> Co-authored-by: Jeff Cook <jeff@jeffcook.io>
5 participants
Summary
ebpf.pluginand several parts of thekernel-collectorsibling project either read/proc/sys/kernel/osreleasedirectly or use it as a fallback. This file ends with a newline, which is read into thekernel_stringvariable.ebpf.pluginthen fails to find the eBPF libraries because it's looking for a filename that ends with a newline.Since it never makes sense for
osreleaseto include a newline, updateebpf.pluginto stop reading by the newline. This fixes the eBPF plugin on my system (which is running a custom kernel) and allows it to load thekernel-collectorcomponents.Component Name
ebpf.pluginTest Plan
I haven't added any tests, but it'd be a good thing to add a test for. I assume a test for this doesn't already exist or it wouldn't have been a problem. 😊
Additional Information
Similar commit for the
kernel-collectorsis on my local and may get around to making a PR for it some day.