From nobody Mon Feb 12 09:12:16 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 4TYJcw4p99z59NK4; Mon, 12 Feb 2024 09:12:16 +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 4TYJcw3sb1z4GCS; Mon, 12 Feb 2024 09:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707729136; 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=A7GZ9Uil9tF2pAr3XLqCqRtl+4MXia99qgYaknJXVv8=; b=nUljq2QW973KMNi9uNpgge+FZQyzKhi43HpOk9/vbJZyY7L8dOwXqcBFxCs1+KzFXqKQjK 5Kz/N8kuLl3lc9xbh+IU7Bew7J8PR/o/eyaPh7w0OicOtVkybQ+qxbfwvAocAu7DSZ5iU5 o8/hfz1IzNrty9GZmV+Y260qZLv2tbSjTPYn8s2BozhIUmuPkprIBMDdc4x2q1rkHOizTz 6dgucbiXxdHlMUbNZJ0/mZxfIiypT34a+Hx9GPSnVGTu6pG7ZVUXl5j/p9Eh9WcIP7dPvf E4M0Mw6aHT+sZ0rvTX+bSb1dXIr+xu6yJQrL8mD4N4BaUo5k499LYFZpjLlwTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707729136; a=rsa-sha256; cv=none; b=GNf3t617LynJtG2H3GohLvtpAe82Zj/gkfMi7oOI2F0oHCHBnlYDQaSLZR1nwr1XzMCSpd PhWEIox5PtkPMsLznsQQZeNqJpO0uHC7jje7isRsjP4FNzaVLGVMjDPy82TouQ0GzeuzHa 4vW2N56qpWpPXPw0+ZPBpg3kOqNok00V0MPY29bmyeD5vQvPVnyBUdm2lVOb7fHHjZfFEF yZQkkj+EPlvOVcOtzi9cTOuAlCuHjIVbI8S3KxjQxFWqSspoXKAq5ru8/u5O7rlLlrN6yx O3seOg+fj4+w8a8JMlXzoVTVo2JZkvQIm+dbbUQbtWxfRRMKyIzoTD4oBsdvQA== 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=1707729136; 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=A7GZ9Uil9tF2pAr3XLqCqRtl+4MXia99qgYaknJXVv8=; b=GcuUvY7WPeFgau1K22KpyXzsa1aJIbksJPKD8DaD+d/PsRtNgoPFAcauXv+CIazrsjXLpT smzphHaKAyKI91vIpO1rTNFxqQxdbdcpMl9molQRC3jYXbIy3OBkOXZ1U9KmcmvW+zpxWr Qx1//H/sFClk7mwnLGe+9mj0WHc8KAe/CRMaljuWONqzJxadJ440DI5Yx0S9NKNEFm31mg s7NUKtm17mIV6W4jW5+4v+ceVry1ATmJzv3vyKUqG2+o8t2HWyt/8kGqhKKN4v0UgntgBG Kt3PtVfxL8NaBwgWVy0aaa+xgLk8o7yqovQkTCRdhjaMcs7ysltDlpZ6RCi7Ow== 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 4TYJcw2x9zzLdR; Mon, 12 Feb 2024 09:12:16 +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 41C9CGMx055975; Mon, 12 Feb 2024 09:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41C9CGlc055972; Mon, 12 Feb 2024 09:12:16 GMT (envelope-from git) Date: Mon, 12 Feb 2024 09:12:16 GMT Message-Id: <202402120912.41C9CGlc055972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 8f0f02c25643 - main - net-mgmt/blackbox_exporter: Make syslog output configurable 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f0f02c25643fcc0be1c488f4fa4f8e95a67716c Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f0f02c25643fcc0be1c488f4fa4f8e95a67716c commit 8f0f02c25643fcc0be1c488f4fa4f8e95a67716c Author: Lexi Winter AuthorDate: 2024-02-12 09:10:01 +0000 Commit: Nuno Teixeira CommitDate: 2024-02-12 09:12:03 +0000 net-mgmt/blackbox_exporter: Make syslog output configurable Add the following new options, based on net-mgmt/ping_exporter: +# blackbox_exporter_syslog_output_tag (str): Set syslog tag. +# Default is "blackbox_exporter". See daemon(8). +# blackbox_exporter_syslog_output_priority (str): Set syslog priority. +# Default is "notice". See daemon(8). +# blackbox_exporter_syslog_output_facility (str): Set syslog facility. +# Default is "daemon". See daemon(8). the defaults are unchanged from before, i.e. it outputs at daemon.notice. PR: 276992 --- net-mgmt/blackbox_exporter/Makefile | 2 +- net-mgmt/blackbox_exporter/files/blackbox_exporter.in | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile index 8fdf03698d1a..7cabf70f70a6 100644 --- a/net-mgmt/blackbox_exporter/Makefile +++ b/net-mgmt/blackbox_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= blackbox_exporter DISTVERSIONPREFIX= v DISTVERSION= 0.24.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MAINTAINER= eduardo@FreeBSD.org diff --git a/net-mgmt/blackbox_exporter/files/blackbox_exporter.in b/net-mgmt/blackbox_exporter/files/blackbox_exporter.in index a00a9f0e5cc5..1ce33146773d 100644 --- a/net-mgmt/blackbox_exporter/files/blackbox_exporter.in +++ b/net-mgmt/blackbox_exporter/files/blackbox_exporter.in @@ -19,6 +19,12 @@ # Default is "localhost:9115". # blackbox_exporter_config (string): Set configuration file of blackbox_exporter # Default is "%%PREFIX%%/etc/blackbox_exporter.yml". +# blackbox_exporter_syslog_output_tag (str): Set syslog tag. +# Default is "blackbox_exporter". See daemon(8). +# blackbox_exporter_syslog_output_priority (str): Set syslog priority. +# Default is "notice". See daemon(8). +# blackbox_exporter_syslog_output_facility (str): Set syslog facility. +# Default is "daemon". See daemon(8). . /etc/rc.subr @@ -33,11 +39,17 @@ load_rc_config $name : ${blackbox_exporter_group:=prometheus} : ${blackbox_exporter_listen_address=localhost:9115} : ${blackbox_exporter_config="%%PREFIX%%/etc/blackbox_exporter.yml"} +: ${blackbox_exporter_syslog_output_tag=${name}} +: ${blackbox_exporter_syslog_output_priority=notice} +: ${blackbox_exporter_syslog_output_facility=daemon} pidfile=/var/run/blackbox_exporter.pid command=/usr/sbin/daemon procname="%%PREFIX%%/bin/blackbox_exporter" -command_args="-p ${pidfile} -t ${name} -T ${name} -S \ +command_args="-p ${pidfile} -t ${name} -S \ + -T ${blackbox_exporter_syslog_output_tag} \ + -s ${blackbox_exporter_syslog_output_priority} \ + -l ${blackbox_exporter_syslog_output_facility} \ /usr/bin/env ${procname} \ --web.listen-address=${blackbox_exporter_listen_address} \ --config.file=${blackbox_exporter_config} \