Created attachment 253450 [details] git format-patch for check_mk_agent Hello, This patch integrate the PR#723, this patch permit to have access to memory information without depending of statgrab dependency. The original PR: https://github.com/Checkmk/checkmk/pull/723 Kind regards, Xavier
The edits to set_variable_defaults() and preamble_1() should be removed, but the actual patch to run_purely_synchronous_sections() looks good to me. I'll switch the libstatgrab dependency to be optional when the serverside changes are made.
Created attachment 253477 [details] git format-patch for check_mk_agent (In reply to Ian Valentine from comment #1) Oh ! It seems I made a mistake make I applied the patch. Thank to head up me on that. The git format-patch has been updated without this mistake. Tell me if you seems this is ok for you ? Kind regards, Xavier
Comment on attachment 253477 [details] git format-patch for check_mk_agent This is still making edits to the directory variables. I've made a patch that reworks how the existing patches to the file function and includes your changes.
Created attachment 253671 [details] 0001-net-mgmt-check_mk_agent-bug-281384.patch
(In reply to Ian Valentine from comment #4) Is this patch ready to be committed or just a work in progress?
(In reply to Bernhard Froehlich from comment #5) Yes, this patch and bug #281637 are both good to be committed.
I'll take it.
In the upstream PR the code was moved to a separate function with this commit: https://github.com/Checkmk/checkmk/pull/723/commits/9d93dfa9a5ba4bf3b6a77e6bd882bf592d8ea3f5
Please let me know which path you want to follow.
Well, I have asked to make as a seperate function by check_mk maintainer. So you can either use the patch on the PR or what has been sent here.
Let's keep this patch, since the actual output is the same. Then it can be removed here after it gets merged upstream.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2757d98eb2f6c0b2e95da75f95397a59c8f0bf3 commit d2757d98eb2f6c0b2e95da75f95397a59c8f0bf3 Author: Xavier Beaudouin <kiwi@oav.net> AuthorDate: 2024-11-01 17:00:38 +0000 Commit: Bernhard Froehlich <decke@FreeBSD.org> CommitDate: 2024-11-01 17:03:23 +0000 net-mgmt/check_mk_agent: Add sysctl_mem feature PR: 281384 Approved by: Ian Valentine <ivalentine@arizona.edu> (maintainer) See: https://github.com/Checkmk/checkmk/pull/723 net-mgmt/check_mk_agent/Makefile | 11 +++--- .../files/patch-check__mk__agent.freebsd | 42 +++++++++++----------- 2 files changed, 27 insertions(+), 26 deletions(-)
Sorry, that it took so long but it's committed now!