From nobody Fri Nov 01 17:04:02 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xg6dt525Cz5c6Vb; Fri, 01 Nov 2024 17:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xg6dt4SNWz45fx; Fri, 1 Nov 2024 17:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730480642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ETfRn12L5hEbeqVhNq3UcJ8jEnL1KAsziAq2odpGM8s=; b=Gq6KptmszdCvf/xyiAlSv423B99HRHNBVWGhiKNkbVcABLkIbQq1j0pQtvovGRIxy1ROVz QkfpYKqbYKuHmwZgH5c/UDaBmgco9Zee/fPHZZWtByZtpMR8LiE2Epe7O5aUn8YrOyCL9k zYeJHOgbeMvq+vO5c+LCkWWCtvfismjQdZhA46t/PnltTHPZ6H4NTLwENkQoxtpPriC7Hx bm9Swl8xgXH3qq68DGz8WMBtU0cYF9iF5KgA8Ou8vaz0hgqDQwtex4yyCTyDtxMYpxdmqv IECldZPubHKVap56aAZXXB4x8uyH8Guo3TTKbnuAdh/Sr/+0ZawRLRjcopferA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730480642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ETfRn12L5hEbeqVhNq3UcJ8jEnL1KAsziAq2odpGM8s=; b=vy/SrfJd4Kgs+yjLF/2EnEFnZEjulor/vqY99HQSvDwNBLXao+IoQoBThM/gQp0i6EAaCD EytcNoSFKrZAJu3i2m9nuyp0Up2JPB0GRXE3j4DzUg+nLCj/ncB9ocZbVr6cUrhdEdjbY0 PBSE8a74u6n5JA5Zm9jyBm/PBZO1jPOQKaINC1uMeX0rvfy9xwqC+DkgkuLxkGXHWtAb9y mCZ3/eN9tpN3LZSiApUdDAR61nBxPi/kqAE/mkQ1zpntpDOK8vBK5VALDTFMq8gaBwUkBf oB4obom6sPaXBo5hbKz/c/o1vFLxna2pOnFYPFgaswL/BGntf700ZZw8Mvb7EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730480642; a=rsa-sha256; cv=none; b=c0g0H0BAsDZkTirsVeS7KROotdqRf8adJhtS68+VcBj7hMvcXEm6W1OJe54hcXZ9sI2EMv NX1Ohmgqi/sTPSICQeuDtnEeQ8yFzMaY9JM4/NiU2Xls6WKTLv6st6ndEpQf6JVyFkuUHW Jjh7Vc8eX+illBq1wUiqjB4SlIHzGn35AVKRROn+w9bGZIS2WkhFvHQMzn8JSe1HS7Yc2o aDwEADhUyoWODHA58p4uqj7FBCRP7DVO8DY/peU/xl+9mtKYSiIH95fusej8OCScwpNyIn j9ECrjllBDhMVdAXXH+dM+wiyoKwBztNS2i2hTypmyY29NyWP1G0K1FNn1rQng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xg6dt43yTzTR4; Fri, 1 Nov 2024 17:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A1H42Jn078829; Fri, 1 Nov 2024 17:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A1H42km078826; Fri, 1 Nov 2024 17:04:02 GMT (envelope-from git) Date: Fri, 1 Nov 2024 17:04:02 GMT Message-Id: <202411011704.4A1H42km078826@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: d2757d98eb2f - main - net-mgmt/check_mk_agent: Add sysctl_mem feature List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2757d98eb2f6c0b2e95da75f95397a59c8f0bf3 Auto-Submitted: auto-generated The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2757d98eb2f6c0b2e95da75f95397a59c8f0bf3 commit d2757d98eb2f6c0b2e95da75f95397a59c8f0bf3 Author: Xavier Beaudouin AuthorDate: 2024-11-01 17:00:38 +0000 Commit: Bernhard Froehlich CommitDate: 2024-11-01 17:03:23 +0000 net-mgmt/check_mk_agent: Add sysctl_mem feature PR: 281384 Approved by: Ian Valentine (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(-) diff --git a/net-mgmt/check_mk_agent/Makefile b/net-mgmt/check_mk_agent/Makefile index 075b3bcba506..674faa3870fe 100644 --- a/net-mgmt/check_mk_agent/Makefile +++ b/net-mgmt/check_mk_agent/Makefile @@ -1,6 +1,7 @@ PORTNAME= check_mk_agent DISTVERSIONPREFIX= v DISTVERSION= 2.3.0p16 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/agents/:agent \ https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/doc/agents/:doc \ @@ -22,7 +23,7 @@ RUN_DEPENDS= bash:shells/bash \ statgrab:devel/libstatgrab \ wget:ftp/wget -USES= perl5 python:3.4+ shebangfix +USES= perl5 python:3.4+,run shebangfix USE_PERL5= run SHEBANG_FILES= ${_CHECKMK_AGENT} @@ -49,12 +50,14 @@ OPTIONS_DEFINE= DOCS _CHECKMK_AGENT= ${PORTNAME}.freebsd _CHECKMK_LIBDIR= ${PREFIX}/lib/check_mk_agent _CHECKMK_CONFDIR= ${PREFIX}/etc/check_mk +_CHECKMK_VARDIR= /var/db/check_mk_agent post-patch: @${REINPLACE_CMD} \ - -e 's|%%CHECKMK_LIBDIR%%|${_CHECKMK_LIBDIR}|' \ - -e 's|%%CHECKMK_CONFDIR%%|${_CHECKMK_CONFDIR}|' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|/usr/local/lib/check_mk_agent|${_CHECKMK_LIBDIR}|' \ + -e 's|/etc/check_mk|${_CHECKMK_CONFDIR}|' \ + -e 's|/var/lib/check_mk_agent|${_CHECKMK_VARDIR}|' \ + -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/${_CHECKMK_AGENT} do-install: diff --git a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd b/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd index 09e7ebd944c3..43c62cdc052e 100644 --- a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd +++ b/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd @@ -1,26 +1,24 @@ ---- check_mk_agent.freebsd.orig 2024-08-15 18:32:18 UTC +--- check_mk_agent.freebsd.orig 2024-10-02 06:30:56 UTC +++ check_mk_agent.freebsd -@@ -117,9 +117,9 @@ set_variable_defaults() { - # - - set_variable_defaults() { -- : "${MK_LIBDIR:=/usr/local/lib/check_mk_agent}" -- : "${MK_CONFDIR:=/etc/check_mk}" -- : "${MK_VARDIR:=/var/lib/check_mk_agent}" -+ : "${MK_LIBDIR:=%%CHECKMK_LIBDIR%%}" -+ : "${MK_CONFDIR:=%%CHECKMK_CONFDIR%%}" -+ : "${MK_VARDIR:=/var/db/check_mk_agent}" - : "${MK_LOGDIR:=/var/log/check_mk_agent}" - - # some 'booleans' -@@ -138,8 +138,8 @@ preamble_1() { - # Make sure locally installed binaries are found - # Only add binaries if they are not already in the path! If you append to path in a loop the process will - # eventually each the 128k size limit for the environment and become a zombie process. See execve manpage. -- [ "${PATH#*"/usr/local/bin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/bin" -- [ "${PATH#*"/usr/local/sbin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/sbin" -+ [ "${PATH#*"%%LOCALBASE%%/bin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/bin" -+ [ "${PATH#*"%%LOCALBASE%%/sbin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/sbin" +@@ -142,6 +142,21 @@ preamble_1() { + [ "${PATH#*"/usr/local/sbin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/sbin" [ -d "/var/qmail/bin" ] && { [ "${PATH#*"/var/qmail/bin"}" != "${PATH}" ] || PATH="${PATH}:/var/qmail/bin"; } ++ echo '<<>>' ++ _page_size=$( sysctl -n vm.stats.vm.v_page_size ) ++ echo "mem.cache $(( _page_size * $( sysctl -n vm.stats.vm.v_cache_count ) ))" ++ echo "mem.free $(( _page_size * $( sysctl -n vm.stats.vm.v_free_count ) ))" ++ echo "mem.total $( sysctl -n hw.physmem )" ++ echo "mem.used $(( _page_size * ( $( sysctl -n vm.stats.vm.v_active_count ) + $( sysctl -n vm.stats.vm.v_wire_count ) ) ))" ++ _swap_total=$( sysctl -n vm.swap_total ) ++ _swap_used=$(( $( swapinfo | tail -1 | awk '{print $3}' ) * 1024 )) ++ echo "swap.free $(( _swap_total - _swap_used ))" ++ echo "swap.total ${_swap_total}" ++ echo "swap.used ${_swap_used}" ++ unset -v _page_size ++ unset -v _swap_total ++ unset -v _swap_used ++ # All executables in PLUGINSDIR will simply be executed and their + # ouput appended to the output of the agent. Plugins define their own + # sections and must output headers with '<<<' and '>>>'