git: e46793ed8da2 - main - net-mgmt/telegraf: update to 1.26.0

The branch main has been updated by girgen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e46793ed8da2c9e492940f5ea0d388a85fd6289b

commit e46793ed8da2c9e492940f5ea0d388a85fd6289b
Author:     Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2023-03-14 09:27:24 +0000
Commit:     Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2023-03-15 00:46:31 +0000

    net-mgmt/telegraf: update to 1.26.0
    
    Add a pkg-message about the requirement to allow mlock if telegraf is to
    be run from a jail.
    
    Telegraf removed the default config files. Instead, a default
    configuration file is generated by running the application as
    `telegraf config`.
    
    Release notes:  https://github.com/influxdata/telegraf/releases/tag/v1.26.0
---
 net-mgmt/telegraf/Makefile                                    |  6 +-----
 net-mgmt/telegraf/distinfo                                    | 10 +++++-----
 .../{patch-etc_telegraf-conf => nono-patch-etc_telegraf-conf} |  0
 net-mgmt/telegraf/pkg-message                                 | 11 +++++++++++
 net-mgmt/telegraf/pkg-plist                                   |  1 -
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 03ff4f82a865..27cee01f478f 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	telegraf
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.25.0
-PORTREVISION=	4
+DISTVERSION=	1.26.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org
@@ -38,8 +37,5 @@ TELEGRAF_LOGDIR=/var/log/${PORTNAME}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/${GH_SUBDIR}/etc/${PORTNAME}.conf  \
-		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo
index b9e769ae9518..51e914ffbcde 100644
--- a/net-mgmt/telegraf/distinfo
+++ b/net-mgmt/telegraf/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1670881263
-SHA256 (go/net-mgmt_telegraf/telegraf-v1.25.0/v1.25.0.mod) = 98f503d97cb98c06718ea2a520109c54717b27280496fa69c60c1b51b90701f3
-SIZE (go/net-mgmt_telegraf/telegraf-v1.25.0/v1.25.0.mod) = 23027
-SHA256 (go/net-mgmt_telegraf/telegraf-v1.25.0/v1.25.0.zip) = 63dcc8589fc8d2bcc0c6b641276ace54010ac5ce1fd60c0465d4ca5601b85b0e
-SIZE (go/net-mgmt_telegraf/telegraf-v1.25.0/v1.25.0.zip) = 5549793
+TIMESTAMP = 1678784910
+SHA256 (go/net-mgmt_telegraf/telegraf-v1.26.0/v1.26.0.mod) = 59a05551dfbd93e4957996344a16b027e65d961ec9d3e1d03bc23122565741c0
+SIZE (go/net-mgmt_telegraf/telegraf-v1.26.0/v1.26.0.mod) = 23379
+SHA256 (go/net-mgmt_telegraf/telegraf-v1.26.0/v1.26.0.zip) = d7493f3b1ab1d1a36e3d4b680c6f9056c1a8338d9da6acb3a1a968e31cad34ea
+SIZE (go/net-mgmt_telegraf/telegraf-v1.26.0/v1.26.0.zip) = 5499673
diff --git a/net-mgmt/telegraf/files/patch-etc_telegraf-conf b/net-mgmt/telegraf/files/nono-patch-etc_telegraf-conf
similarity index 100%
rename from net-mgmt/telegraf/files/patch-etc_telegraf-conf
rename to net-mgmt/telegraf/files/nono-patch-etc_telegraf-conf
diff --git a/net-mgmt/telegraf/pkg-message b/net-mgmt/telegraf/pkg-message
new file mode 100644
index 000000000000..84952e3909e7
--- /dev/null
+++ b/net-mgmt/telegraf/pkg-message
@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOF
+Running telegraf in a jail requires setting
+allow.mlock=1;
+in /etc/jail.conf
+
+A config file can be created by running `telegraf config`.
+EOF
+}
+]
diff --git a/net-mgmt/telegraf/pkg-plist b/net-mgmt/telegraf/pkg-plist
index fd9538e465e5..0e08028046bb 100644
--- a/net-mgmt/telegraf/pkg-plist
+++ b/net-mgmt/telegraf/pkg-plist
@@ -1,3 +1,2 @@
 bin/telegraf
 @dir(%%TELEGRAF_USER%%,%%TELEGRAF_GROUP%%,0750) %%TELEGRAF_LOGDIR%%
-@sample etc/telegraf.conf.sample