From nobody Thu Mar 26 10:35:27 2026 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 4fhKtD3MPYz6Wk3C for ; Thu, 26 Mar 2026 10:35:32 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhKtD2f2Jz4994 for ; Thu, 26 Mar 2026 10:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774521332; 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=k+3wC0UGEkZLaVs8NMcfIYVHE2WHZ2xjY+aC8hH8oVY=; b=ulwLfotJkGHaqre+4mO8m4frt2afl/3QGkHx+wFKao4onuct0aCdowm2f1cy7EnQ+/3O23 TcCkIqpGViElf16kv0h2YDz0mmrKC48QK/Y8uUfVKpRa92/as4tdYl2IGuIlgl2/4GVn0Z Am1EpBU/mx9sUt5KcIU8YJDlBUii6l42lvszvt+xjzteKDPJf39kAEuQFJeYuA5NQk01f+ 7e4Ly5GueKgKQzy5hzF0TxlWsofDmSc3DXoOJ1UTQ/Cr0B6rMN5Dw7APFo7XEaxUNtEJaY UDeHMv0+iQKqRzMEKJvRXvSwiMr2WzyTVyBjSiAAX6haXxK/7Kx4nSndHXoloA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774521332; a=rsa-sha256; cv=none; b=NnR1XBiXeBPorihluRBXe2pqV02iGxkXQQv6ETgZ8VZFrouaGQc35wf1j7JNKn8roGUBJB yTXFZyeJXy8BHVgVT2jN45yM5pn2WRY320vPNrMlHumHyuu1+ZkKxfw9ACvIG5+Q2nMqjM MJKzmvHPEt3mgx4gsHur3A1hjfLOV4ozY0M0dbfMT7fAENTCWooseCf0LyhpgpbtuEYB8y /zuhHCTj/8gxczjLsEG7XPWIg0RcYHebEPIS85gwJ/1OTzNxfB5MyVd5DTzPiGL1WRQIOx rwPGi8L8oHeuHxnuW5U+y+o7W8Cc7wOwcs4oN4NTRRplLnNglbdj2MsTFXwRVQ== 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=1774521332; 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=k+3wC0UGEkZLaVs8NMcfIYVHE2WHZ2xjY+aC8hH8oVY=; b=diSF3rFKi5POyOPTo4cmuSZoVNL1gjwXLJIHw2P3Mkaoxc54ARXbmMZKAn0Q4WU1IEm5xB kqufWDvI/eTCbsUirdFUfORxwwtObQuj3OtwciZm/Y/KxKIjH48Oj4gRVWW9pWXka8cWLF EhwPJh6ad4XbSKPZ7dV6QP2JZ3K9rTUW12ag9DDxCWV/6LIlBpueyq1qa99IkSQeAfzhuQ yN75pVdX60IGFwViiQVd6qiWZoj0LrKF+SR0pq3K1dYMahVzAdNe8SjrfUhbIGOsH2JS/r vX9nobV3g9h1e90Us7gj6o3ySaIpxQzIWCmdQ4TMJa8LIs7xsY09Fnai2CPl5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhKt72Bs1zpcR for ; Thu, 26 Mar 2026 10:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36684 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 10:35:27 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: ce7c868fd6ea - main - net-mgmt/telegraf: fix startup problems when probes time out 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: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce7c868fd6eae6bb1c56939278aaa478240527bb Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 10:35:27 +0000 Message-Id: <69c50bef.36684.5d796d2b@gitrepo.freebsd.org> The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce7c868fd6eae6bb1c56939278aaa478240527bb commit ce7c868fd6eae6bb1c56939278aaa478240527bb Author: Palle Girgensohn AuthorDate: 2026-03-26 10:15:39 +0000 Commit: Palle Girgensohn CommitDate: 2026-03-26 10:35:22 +0000 net-mgmt/telegraf: fix startup problems when probes time out Use check config instead of --test, as suggested in the discussion at [1]. [1]: https://github.com/influxdata/telegraf/issues/18566 PR: 294052 --- net-mgmt/telegraf/Makefile | 1 + net-mgmt/telegraf/files/telegraf.in | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 91b9314cc456..14cfbcba702c 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,6 +1,7 @@ PORTNAME= telegraf DISTVERSIONPREFIX=v DISTVERSION= 1.38.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= girgen@FreeBSD.org diff --git a/net-mgmt/telegraf/files/telegraf.in b/net-mgmt/telegraf/files/telegraf.in index 2a76706af639..c8c1a42a8d07 100644 --- a/net-mgmt/telegraf/files/telegraf.in +++ b/net-mgmt/telegraf/files/telegraf.in @@ -54,7 +54,11 @@ telegraf_prestart() exit 1 fi install -d -o ${telegraf_user} -g ${telegraf_group} -m 750 %%TELEGRAF_LOGDIR%% - if ! %%PREFIX%%/bin/${name} --test ${telegraf_options} > /dev/null 2>&1; then + _check_args="--config=${telegraf_conf}" + if [ -n "${telegraf_confdir}" ]; then + _check_args="${_check_args} --config-directory=${telegraf_confdir}" + fi + if ! %%PREFIX%%/bin/${name} config check ${_check_args} > /dev/null 2>&1; then echo WARNING: failing to start ${name} ${telegraf_options} echo Try running ${name} --test ${telegraf_options} exit 1