From nobody Sun Mar 19 19:47:52 2023 X-Original-To: dev-commits-ports-all@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 4PfpLd17zXz3ybMk; Sun, 19 Mar 2023 19:47:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PfpLd0fqMz3Qkv; Sun, 19 Mar 2023 19:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679255273; 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=HMRzeOvGxZR7UvppllMdXpQRns4US3NWRRjp4EYduYc=; b=ACZ87Lt+5Qq4n8kBJa1HeYZnVCgudCcLxDRDp7ynDlAZnFydc230ul+8x1iYaYhpJzJqwd Yo5EaJxdetxlluEzcSRFVgiaugRCldiqgOq+eoR0uBtobje6dUfy6UDN6jViwofQ1cHvD9 X63PLyMwOvaXBYQ9FoqO+RMand3tcG7owdOHRYMVCEXgbfZy6QzhrB+C6Bpz9jP5KkXIWe 7B5slv+gEzPawn09jII6UFGDEdUGnLYt2y4CLsfAVj7LJQsvQhTb1+OtTzXQjUHz8iE+zs BbQeJXaqcGZRZ/bZi+92zdYs3oOE4Guxd7DvWiBwv+qaPlNwiWT0+4o+Xb+1MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679255273; 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=HMRzeOvGxZR7UvppllMdXpQRns4US3NWRRjp4EYduYc=; b=OaCD0NZ1tPc5AaqDoxw7zaw1TYYLCqL46FeAmo0svJhnKsGDthwd9AVd5yYJY/E2IAeZ/s J5Lr3qautQAjpPfm1FfTCGe4A6Y5Y8fuNxm5wYeXSXpCWsePVzTddgOtlo3q1luxAkOfJm YlIqajcck/43w8+7l9BcN5yiBRffzLlya14fZBm8LEn7rG61Zos12o27FM2PB8UCOQGZHa IlOqwmSdDiyJFxGHhIL8bQEkjdG4qvHcpnVa110OBWjqXYsbCYjdJNf+e4eiSKfyehhVpZ yIZoqGIpcQPFqyh8Kz18TA7e3xJVYBdPKyWaI9DMidRY3h8568H3lSQllk7NEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679255273; a=rsa-sha256; cv=none; b=oGsv33sgppjPIac3zgA69k26EqjUlrGKAZsIGF+q4VOuRMV6+rSbyn853ttWUyFVgBYFKC DEpnLBNKyrGSM3A+epMWVxUejC0qUHNm40AYi4OybOAozHuyr/oW8diE4utFzU3TBTbYR7 /2Nh7DUybOmExJRy/QkVgY6BU60csDrH3sCTFYg5/8r9sEARHqVEbhNuyON8IXDz28lnJz jD6nLGRBuriYJevKC6sUT8ON++SnWp2YKoeBxXWP1m7+5kSlvk3YknUU3N9MeJYVCblBOA rjkkRb3H3JL8aTnWglg3Css+E2v8S7+qf4BwOQIqi9tP+NoKDbjWJiJ1uAyUPw== 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 4PfpLc6r3Zz11cK; Sun, 19 Mar 2023 19:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32JJlqwZ015964; Sun, 19 Mar 2023 19:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32JJlqNI015963; Sun, 19 Mar 2023 19:47:52 GMT (envelope-from git) Date: Sun, 19 Mar 2023 19:47:52 GMT Message-Id: <202303191947.32JJlqNI015963@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 9abc07bcb315 - main - net-mgmt/check_mk_agent: Update to 2.1.0p22 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9abc07bcb3156136cf28a86c56dc1d1e7cc00dba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=9abc07bcb3156136cf28a86c56dc1d1e7cc00dba commit 9abc07bcb3156136cf28a86c56dc1d1e7cc00dba Author: Ian Valentine AuthorDate: 2023-03-03 08:26:38 +0000 Commit: Fernando Apesteguía CommitDate: 2023-03-19 19:43:25 +0000 net-mgmt/check_mk_agent: Update to 2.1.0p22 PR: 269925 Reported by: ivalentine@arizona.edu (maintainer) --- net-mgmt/check_mk_agent/Makefile | 7 +--- net-mgmt/check_mk_agent/distinfo | 14 +++---- .../files/patch-check__mk__agent.freebsd | 47 +++++++++------------- net-mgmt/check_mk_agent/pkg-descr | 19 +++++++-- 4 files changed, 45 insertions(+), 42 deletions(-) diff --git a/net-mgmt/check_mk_agent/Makefile b/net-mgmt/check_mk_agent/Makefile index 6e1a0dc55077..aec345b5c61b 100644 --- a/net-mgmt/check_mk_agent/Makefile +++ b/net-mgmt/check_mk_agent/Makefile @@ -1,6 +1,6 @@ PORTNAME= check_mk_agent DISTVERSIONPREFIX= v -DISTVERSION= 2.0.0p20 +DISTVERSION= 2.1.0p22 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/tribe29/checkmk/${DISTVERSIONFULL}/agents/:agent \ https://raw.githubusercontent.com/tribe29/checkmk/${DISTVERSIONFULL}/doc/agents/:doc \ @@ -11,7 +11,7 @@ DISTFILES= ${_CHECKMK_AGENT}:agent \ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= ivalentine@arizona.edu -COMMENT= Nagios-compatible agent for the Checkmk monitoring +COMMENT= Checkmk agent to monitor *nix style systems WWW= https://checkmk.com/ LICENSE= GPLv2 @@ -46,15 +46,12 @@ OPTIONS_DEFINE= DOCS _CHECKMK_AGENT= ${PORTNAME}.freebsd _CHECKMK_CONFDIR= ${LOCALBASE}/etc/check_mk _CHECKMK_LIBDIR= ${LOCALBASE}/lib/check_mk_agent -_CHECKMK_TMPDIR= /var/run/check_mk post-patch: @${REINPLACE_CMD} \ -e 's|%%CHECKMK_LIBDIR%%|${_CHECKMK_LIBDIR}|' \ -e 's|%%CHECKMK_CONFDIR%%|${_CHECKMK_CONFDIR}|' \ - -e 's|%%CHECKMK_TMPDIR%%|${_CHECKMK_TMPDIR}|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%BASH%%|${LOCALBASE}/bin/bash|' \ ${WRKSRC}/${_CHECKMK_AGENT} do-install: diff --git a/net-mgmt/check_mk_agent/distinfo b/net-mgmt/check_mk_agent/distinfo index 687929586852..93c84aaa2b46 100644 --- a/net-mgmt/check_mk_agent/distinfo +++ b/net-mgmt/check_mk_agent/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1645394456 -SHA256 (check_mk_agent-2.0.0.p20/check_mk_agent.freebsd) = 8a332e0f73533ffacf03a5cab2e42a4ff76e104777c8fe548a41618097661536 -SIZE (check_mk_agent-2.0.0.p20/check_mk_agent.freebsd) = 14350 -SHA256 (check_mk_agent-2.0.0.p20/README.FreeBSD) = 01094a2197ca0a3a43ac16098c0f800d2ee808db2fd9a2f133f4bad04062ec5f -SIZE (check_mk_agent-2.0.0.p20/README.FreeBSD) = 1349 -SHA256 (check_mk_agent-2.0.0.p20/COPYING) = fbaab079995bef694ef8451f0f763b91b44e5b57b8e2a487d2a240b395187a7f -SIZE (check_mk_agent-2.0.0.p20/COPYING) = 15174 +TIMESTAMP = 1677107456 +SHA256 (check_mk_agent-2.1.0.p22/check_mk_agent.freebsd) = c99b59beb8d0eee0916e8dc4b7f9dcce08afb62e157856e785837aadb0f071ec +SIZE (check_mk_agent-2.1.0.p22/check_mk_agent.freebsd) = 28094 +SHA256 (check_mk_agent-2.1.0.p22/README.FreeBSD) = 01094a2197ca0a3a43ac16098c0f800d2ee808db2fd9a2f133f4bad04062ec5f +SIZE (check_mk_agent-2.1.0.p22/README.FreeBSD) = 1349 +SHA256 (check_mk_agent-2.1.0.p22/COPYING) = fbaab079995bef694ef8451f0f763b91b44e5b57b8e2a487d2a240b395187a7f +SIZE (check_mk_agent-2.1.0.p22/COPYING) = 15174 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 1516ac616f85..0f20cdf271c2 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,31 +1,24 @@ ---- check_mk_agent.freebsd.orig 2021-10-31 19:22:57 UTC +--- check_mk_agent.freebsd.orig 2023-02-22 23:45:20 UTC +++ check_mk_agent.freebsd -@@ -27,15 +27,15 @@ $MK_RUN_SYNC_PARTS || { - export LC_ALL=C - unset LANG +@@ -105,8 +105,8 @@ set_up_get_epoch() { + # --export MK_LIBDIR="/usr/local/lib/check_mk_agent" --export MK_CONFDIR="/etc/check_mk" --export MK_TMPDIR="/var/run/check_mk" -+export MK_LIBDIR="%%CHECKMK_LIBDIR%%" -+export MK_CONFDIR="%%CHECKMK_CONFDIR%%" -+export MK_TMPDIR="%%CHECKMK_TMPDIR%%" + set_variable_defaults() { +- : "${MK_LIBDIR:=/usr/local/lib/check_mk_agent}" +- : "${MK_CONFDIR:=/etc/check_mk}" ++ : "${MK_LIBDIR:=%%CHECKMK_LIBDIR%%}" ++ : "${MK_CONFDIR:=%%CHECKMK_CONFDIR%%}" + : "${MK_VARDIR:=/var/lib/check_mk_agent}" + : "${MK_LOGDIR:=/var/log/check_mk_agent}" - # Optionally set a tempdir for all subsequent calls - #export TMPDIR= - - # Make sure, locally installed binaries are found --PATH=$PATH:/usr/local/bin:/usr/local/sbin -+PATH=$PATH:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin - [ -d /var/qmail/bin ] && PATH=$PATH:/var/qmail/bin - - # All executables in PLUGINSDIR will simply be executed and their -@@ -102,7 +102,7 @@ function run_cached() { - - # Cache file outdated and new job not yet running? Start it - if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then -- echo "$CMDLINE" | daemon /usr/local/bin/bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & -+ echo "$CMDLINE" | daemon %%BASH%% -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & - fi - } +@@ -126,8 +126,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" + [ -d "/var/qmail/bin" ] && { [ "${PATH#*"/var/qmail/bin"}" != "${PATH}" ] || PATH="${PATH}:/var/qmail/bin"; } + # All executables in PLUGINSDIR will simply be executed and their diff --git a/net-mgmt/check_mk_agent/pkg-descr b/net-mgmt/check_mk_agent/pkg-descr index b5f8b79986d3..b9fce46e2f61 100644 --- a/net-mgmt/check_mk_agent/pkg-descr +++ b/net-mgmt/check_mk_agent/pkg-descr @@ -1,3 +1,16 @@ -Checkmk is a software for effective IT monitoring. Easy installation, -best-in-class scalability and a broad range of features are just some of the -reasons why more and more users become Checkmk fans. +For a monitoring system to receive more information from an endpoint +other than that it is simply accessible, help is required from the +target system. For example - how else can Checkmk know how full a +server's storage volume is without that system somehow providing the +information? The component that provides this information is always an +active piece of software - namely a monitoring agent, usually just +referred to as an agent. An agent collects data relevant to monitoring +from a host at specified intervals and transmits that data to the +monitoring server. + +For servers and workstations, Checkmk provides its own agents, these +are known as Checkmk agents. Checkmk agents are available for a wide +variety of operating systems - from the commonplace such as Windows and +Linux to exotics such as OpenVMS. The agents are passive and listen on +TCP port 6556. Only on receiving a Checkmk server query will these +agents be activated and respond with the required data.