From nobody Thu Dec 28 17:10:06 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 4T1FPV69zhz56BJS; Thu, 28 Dec 2023 17:10:06 +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 4T1FPV5jCXz3Yrl; Thu, 28 Dec 2023 17:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703783406; 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=UcNdtVT3BxZu/1Su+bpW47zoe9n8Rgx7jvzdnq1uJAQ=; b=eFk4Y4ppMyU+Egw/2RxQvQHxF6W/X3rPE8fP6CIBmZKMvxh/MYcGcvziiflhLuE86SrHYd ogSFPfZSsFUvIG+jlvF/aVU3DNSTXZMk1oSakj0LhU0xDkxBv/AP2PQ2opJh22/MYVUc/P dU947zHZrWLUMKM/AjaO8k2pBly7f/AuwodTDQCu5ECmNLG1XrxDxozm3eVxFI+m5gCkMQ kMvo0zMROg6f8xBuI/wBS0qLQeQkfS67xENazy3D77PybDy744zltbLsy4gCoCQ59sQxhn BxdYLs304reSFvTGNKg4kSDv5VdMN0CNcI7P64a1DiDfRt+S1TVCsoi3Dad0Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703783406; a=rsa-sha256; cv=none; b=uIhGWbcuyxoJ93tTALhHO0g8YRzTU9SPRyhfNg72/b/71RHX52bsd5MFB/U64TrNNbChXc haQgx9B7YmMSnnFtFzovuaca1r6TpLiWD9nc575cGHnQZobA1h1CZK2bpvu5hvac8eWTT9 GH2dcs/91Nq2O+A4lwJaZwXjBmj4OpkG5+27K4J+4YKKr1BpTiBgbaI/p/C/7nGkCrg4ve 9XagrpxRMEN+x2ZQtE9Cvwltn/tFBENdzdUHq/xJXlxQFGvQ1VZexluruWKX7JR5CwiIaX /ab9ENZTDFQqoSR0T1SRO4aDvIpi02QzAmV75WzC8W6fEVUkigz7T++lMBjlJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703783406; 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=UcNdtVT3BxZu/1Su+bpW47zoe9n8Rgx7jvzdnq1uJAQ=; b=CzgKCSQ6dgv8i64QHOt+6gSyaOktn0zIQlarGeFkyoxh7DUGgvvLmNlO/9mAShqE2Shvrl sAV2kh65Fdi5otF/OOaoEeX6X+rw/wtS6/My+9TLU7P8d1IoNoOII29V+QUQo0LgyxH15a AlhKsq3imLlVdr0kwQJwBtzOT+tSp0cX6pZ7G7c4COuuzvaspWM0kvhY6Za1XgEvt8fh76 /RHlXaxkukxbsiKbveT5PFmlsFT2paiBhQY6iXJuD0Syi8JCBOO4t+YUVDH87Dj15b23L1 snNQT06akA40yTDgGcibccbGHIEoFzmrWT62kdpkUPRNGstXt6EMhykBgqXZhA== 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 4T1FPV4TGyzWvK; Thu, 28 Dec 2023 17:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSHA6nh059758; Thu, 28 Dec 2023 17:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSHA6J5059754; Thu, 28 Dec 2023 17:10:06 GMT (envelope-from git) Date: Thu, 28 Dec 2023 17:10:06 GMT Message-Id: <202312281710.3BSHA6J5059754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: b534a3d03a7d - main - net-mgmt/ping_exporter: Update to 1.1.0 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: b534a3d03a7dfab1f70b755b668d0feab4b40bb5 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b534a3d03a7dfab1f70b755b668d0feab4b40bb5 commit b534a3d03a7dfab1f70b755b668d0feab4b40bb5 Author: Boris Korzun AuthorDate: 2023-12-28 16:54:28 +0000 Commit: Fernando Apesteguía CommitDate: 2023-12-28 17:09:50 +0000 net-mgmt/ping_exporter: Update to 1.1.0 ChangeLog: https://github.com/czerwonk/ping_exporter/releases/tag/1.1.0 * bump golang.org/x/net from 0.5.0 to 0.7.0 * Feature: disable ipv4 addresses * implement custom labels for targets * auto discover targets using tailscale API PR: 275628 Reported by: drtr0jan@yandex.ru Approved by: jp+ports@supplntr.io (maintainer, timeout > 2 weeks) --- net-mgmt/ping_exporter/Makefile | 11 ++----- net-mgmt/ping_exporter/distinfo | 10 +++--- net-mgmt/ping_exporter/files/ping_exporter.in | 47 ++++++++------------------- net-mgmt/ping_exporter/pkg-plist | 2 -- 4 files changed, 22 insertions(+), 48 deletions(-) diff --git a/net-mgmt/ping_exporter/Makefile b/net-mgmt/ping_exporter/Makefile index 250690306d90..f833b41a2b42 100644 --- a/net-mgmt/ping_exporter/Makefile +++ b/net-mgmt/ping_exporter/Makefile @@ -1,24 +1,19 @@ PORTNAME= ping_exporter -DISTVERSION= 1.0.1 -PORTREVISION= 9 +DISTVERSION= 1.1.0 CATEGORIES= net-mgmt -MASTER_SITES= https://raw.githubusercontent.com/czerwonk/ping_exporter/${DISTVERSIONFULL}/:gomod -DISTFILES= go.mod:gomod MAINTAINER= jp+ports@supplntr.io COMMENT= Prometheus exporter for ICMP echo requests WWW= https://github.com/czerwonk/ping_exporter -LICENSE= APACHE20 +LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules -USE_GITHUB= yes -GH_ACCOUNT= czerwonk USE_RC_SUBR= ping_exporter -GO_MODULE= github.com/czerwonk/ping_exporter +GO_MODULE= github.com/czerwonk/ping_exporter@v0.0.0-20230519045214-d3a6779128c3 SUB_FILES= pkg-message diff --git a/net-mgmt/ping_exporter/distinfo b/net-mgmt/ping_exporter/distinfo index e9ba5e88048f..06ccc3e0142e 100644 --- a/net-mgmt/ping_exporter/distinfo +++ b/net-mgmt/ping_exporter/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1669193030 -SHA256 (go/net-mgmt_ping_exporter/czerwonk-ping_exporter-1.0.1_GH0/go.mod) = b824d4e9c3b5f990ceca986be7f61f2e106ab1bda8b313938da0201b804e554d -SIZE (go/net-mgmt_ping_exporter/czerwonk-ping_exporter-1.0.1_GH0/go.mod) = 973 -SHA256 (go/net-mgmt_ping_exporter/czerwonk-ping_exporter-1.0.1_GH0/czerwonk-ping_exporter-1.0.1_GH0.tar.gz) = bbd1db514e2f93859d82f40821524b374d3f105f3bcdf4e5290b0404d699f4f7 -SIZE (go/net-mgmt_ping_exporter/czerwonk-ping_exporter-1.0.1_GH0/czerwonk-ping_exporter-1.0.1_GH0.tar.gz) = 42870 +TIMESTAMP = 1702027163 +SHA256 (go/net-mgmt_ping_exporter/ping_exporter-1.1.0/v0.0.0-20230519045214-d3a6779128c3.mod) = b926c2b2def80e683cd4645ea61b5a6aaf04f492d68bf17a9d5ef951fe3e3b30 +SIZE (go/net-mgmt_ping_exporter/ping_exporter-1.1.0/v0.0.0-20230519045214-d3a6779128c3.mod) = 2212 +SHA256 (go/net-mgmt_ping_exporter/ping_exporter-1.1.0/v0.0.0-20230519045214-d3a6779128c3.zip) = 1223f3c3761dbc532f1c8641129602956ccaf44c073754e8b9a491b252d6dfa9 +SIZE (go/net-mgmt_ping_exporter/ping_exporter-1.1.0/v0.0.0-20230519045214-d3a6779128c3.zip) = 51347 diff --git a/net-mgmt/ping_exporter/files/ping_exporter.in b/net-mgmt/ping_exporter/files/ping_exporter.in index 898719fbd53c..9408980ab5dd 100644 --- a/net-mgmt/ping_exporter/files/ping_exporter.in +++ b/net-mgmt/ping_exporter/files/ping_exporter.in @@ -3,21 +3,13 @@ # PROVIDE: ping_exporter # REQUIRE: LOGIN # KEYWORD: shutdown -# + # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # ping_exporter_enable (bool): Set to NO by default. # Set it to YES to enable ping_exporter. -# ping_exporter_user (string): Set user that ping_exporter will run under -# Default is "nobody". -# ping_exporter_group (string): Set group that ping_exporter will run under -# Default is "nobody". -# ping_exporter_args (string): Set extra arguments to pass to ping_exporter -# Default is "". -# ping_exporter_listen_address (string): Set ip:port that ping_exporter will listen on -# Default is "localhost:9427". -# ping_exporter_config (string): Set configuration file of ping_exporter +# ping_exporter_config (str): Set configuration file of ping_exporter # Default is "%%PREFIX%%/etc/ping_exporter.yml". # ping_exporter_syslog_output_enable (bool): Set to YES to enable syslog output # Default is "YES". See daemon(8). @@ -27,7 +19,10 @@ # Default is "notice". See daemon(8). # ping_exporter_syslog_output_facility (str): Set to YES to enable syslog output # Default is "daemon". See daemon(8). - +# ping_exporter_listen_address (string): Set ip:port that ping_exporter will listen on +# Default is "localhost:9427". +# ping_exporter_args (str): Set extra arguments to pass to ping_exporter +# Default is "". . /etc/rc.subr @@ -38,13 +33,9 @@ rcvar=ping_exporter_enable load_rc_config $name : ${ping_exporter_enable:=NO} -: ${ping_exporter_user:=nobody} -: ${ping_exporter_group:=nobody} -: ${ping_exporter_listen_address=localhost:9427} : ${ping_exporter_config="%%PREFIX%%/etc/ping_exporter.yml"} : ${ping_exporter_syslog_output_enable:="YES"} - -start_precmd=ping_exporter_startprecmd +: ${ping_exporter_listen_address=localhost:9427} if checkyesno ping_exporter_syslog_output_enable; then if [ -n "${ping_exporter_syslog_output_tag}" ]; then @@ -60,24 +51,14 @@ if checkyesno ping_exporter_syslog_output_enable; then fi fi -pidfile=/var/run/ping_exporter.pid -procname="%%PREFIX%%/bin/ping_exporter" -required_files="${ping_exporter_config}" +pidfile=/var/run/${name}.pid +required_files="${ping_exporter_config}" command=/usr/sbin/daemon -command_args="-p ${pidfile} -t ${name} ${ping_exporter_syslog_output_flags} -S \ - /usr/bin/env ${procname} \ - --web.listen-address=${ping_exporter_listen_address} \ - --config.path=${ping_exporter_config} \ - ${ping_exporter_args} 2>&1" - -ping_exporter_startprecmd() -{ - if [ ! -e ${pidfile} ]; then - install -o ${ping_exporter_user} -g ${ping_exporter_group} /dev/null ${pidfile}; - else - chown ${ping_exporter_user}:${ping_exporter_group} ${pidfile}; - fi -} +command_args="-f -P ${pidfile} -t ${name} ${ping_exporter_syslog_output_flags} \ + /usr/bin/env ${ping_exporter_env} %%PREFIX%%/bin/ping_exporter \ + --config.path=${ping_exporter_config} \ + --web.listen-address=${ping_exporter_listen_address} \ + ${ping_exporter_args}" run_rc_command "$1" diff --git a/net-mgmt/ping_exporter/pkg-plist b/net-mgmt/ping_exporter/pkg-plist index e5b94c1e9591..e8676dd8f5e2 100644 --- a/net-mgmt/ping_exporter/pkg-plist +++ b/net-mgmt/ping_exporter/pkg-plist @@ -1,6 +1,4 @@ -@mode 4755 bin/ping_exporter -@mode @sample %%ETCDIR%%.yml.sample %%DATADIR%%/newsyslog.conf.d/ping_exporter.conf %%DATADIR%%/syslog.d/ping_exporter.conf