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

Implemented more common check_mk agent sections #4

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

jens-maus
Copy link
Contributor

@jens-maus jens-maus commented Oct 24, 2018

This PR implements:

  • using timeout wrapper script to secure tcp_conn_stats and chrony/ntp executions which could hang otherwise
  • implements <<<nfsmounts>>> and <<<cifsmounts>>> sections if /bin/stat exists and waitmax is there.
  • revised <<<lnx_thermal>>> check_mk output to add all existing thermal zones actually existing and not just thermal_zone0
  • uses /VERSION rather than /boot/VERSION to query the firmware version if /VERSION exists (which is the preferred way for CCU3/RaspberryMatic).

of ps is somewhat limited to the capabilities to the ps command of
busybox for which conversion routines might be a solution in future. But
for the moment this should be enough to actually monitor if a certain
process is running or not.
also added to the check_mk output as well as the trip_point limits
defined by the hardware.
to the check_mk agent execution. Also implemented nfsmounts and
cifsmounts outputs using waitmax.
@alexreinert
Copy link
Owner

Thanks for the PR.
The inclusion of waitmax violates with the GPLv2, because of that I cannot merge this PR.

@jens-maus
Copy link
Contributor Author

Then feel free to remove the waitmax use from the PR.

Or reconsider changing the license of your Addon to GPLv2 itself or add the waitmax sources to your repository to show that you haven't changed anything.

…erryMatic

versions will use chrony instead of NTPd.
should provide the same functionality but is licensed under GPL3 which
is compatible to Apache2.
@jens-maus
Copy link
Contributor Author

@alexreinert Please note that with the latest commit I retired waitmax and introduced the coreutils timeout command which provides essentially the same functionality but is licensed under the GPL3 license which seem to be compatible to the Apache2.0 license (see https://www.apache.org/licenses/GPL-compatibility.html) this project is licensed.

@alexreinert
Copy link
Owner

The linked page states, that this direction is not possible.

However, GPLv3 software cannot be included in Apache projects.

Only GPL license, which would be compatible in that way, would be the LGPL.

And I will not include binaries in my repositories, where I do not know, how they are build. (Because of security AND because of support)

'timeout' command (e.g. on RaspberryMatic) or to use shell syntax to
replicate the same functionality just using shell functionality. This
should hopefully solve any licensing issues between GPL and Apache2
license under which this check_mk_agent is licensed.
@jens-maus
Copy link
Contributor Author

Woooh. Ok, I definitely overlooked that final sentence. Never mind, I just introduced a replacement wrapper script in my last commit (see fcc773b) and explicitly licensed it under Apache2.0 for your convenience. This hopefully should solve your license concerns while at the same time provide a reliable timeout functionality for all supported CCU platforms.

@alexreinert
Copy link
Owner

Looks better now, thanks.
I will test all changes on the supported platforms, hopefully I can do this 'til the weekend.

'timeout' command syntax where the time to wait is supplied via a second
argument rather than a "-t" option.
@jens-maus
Copy link
Contributor Author

any progress here? I would like to finished this PR and get my fork cleanup up accordingly. Would be nice to see this PR finally integrated. Here it is working stable since then

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants