diff options
Diffstat (limited to 'net-mgmt/telegraf')
| -rw-r--r-- | net-mgmt/telegraf/Makefile | 5 | ||||
| -rw-r--r-- | net-mgmt/telegraf/distinfo | 10 | ||||
| -rw-r--r-- | net-mgmt/telegraf/files/patch-config_config.go | 18 | ||||
| -rw-r--r-- | net-mgmt/telegraf/files/telegraf.in | 4 |
4 files changed, 31 insertions, 6 deletions
diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 68b721ce7ffe..f63abcc8eec5 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,6 +1,6 @@ PORTNAME= telegraf DISTVERSIONPREFIX=v -DISTVERSION= 1.34.2 +DISTVERSION= 1.34.4 CATEGORIES= net-mgmt MAINTAINER= girgen@FreeBSD.org @@ -35,6 +35,9 @@ GROUPS= ${TELEGRAF_GROUP} TELEGRAF_LOGDIR=/var/log/${PORTNAME} +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config/config.go + post-install: ${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR} diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo index d36d63ceba8e..af5e1f245873 100644 --- a/net-mgmt/telegraf/distinfo +++ b/net-mgmt/telegraf/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1744714785 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.mod) = cc8644deb9eb449241d909b0d0dc8ca9d19943863bfe84d683c123511957a360 -SIZE (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.mod) = 27169 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.zip) = 6eb4ae787983b612c4b85018c8c57d225d95bc202ae51209f019763906076d4d -SIZE (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.zip) = 7051054 +TIMESTAMP = 1747723900 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.4/v1.34.4.mod) = d18ee89c7c0a4a05c66289af9c3a8cd2e92a38211222828884d1a08a0345b8ad +SIZE (go/net-mgmt_telegraf/telegraf-v1.34.4/v1.34.4.mod) = 27351 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.4/v1.34.4.zip) = 0418126ae85ed0cede3c30d4e638cd1475269c02e2a555ab71e9bf9a43cd9a1f +SIZE (go/net-mgmt_telegraf/telegraf-v1.34.4/v1.34.4.zip) = 7067750 diff --git a/net-mgmt/telegraf/files/patch-config_config.go b/net-mgmt/telegraf/files/patch-config_config.go new file mode 100644 index 000000000000..a6f1c04b7722 --- /dev/null +++ b/net-mgmt/telegraf/files/patch-config_config.go @@ -0,0 +1,18 @@ +--- config/config.go.orig 2025-05-06 11:09:55.069815000 +0000 ++++ config/config.go 2025-05-06 11:10:17.098859000 +0000 +@@ -481,12 +481,12 @@ + // Try to find a default config file at these locations (in order): + // 1. $TELEGRAF_CONFIG_PATH + // 2. $HOME/.telegraf/telegraf.conf +-// 3. /etc/telegraf/telegraf.conf and /etc/telegraf/telegraf.d/*.conf ++// 3. /usr/local/etc/telegraf/telegraf.conf and /etc/telegraf/telegraf.d/*.conf + func GetDefaultConfigPath() ([]string, error) { + envfile := os.Getenv("TELEGRAF_CONFIG_PATH") + homefile := os.ExpandEnv("${HOME}/.telegraf/telegraf.conf") +- etcfile := "/etc/telegraf/telegraf.conf" +- etcfolder := "/etc/telegraf/telegraf.d" ++ etcfile := "/usr/local/etc/telegraf/telegraf.conf" ++ etcfolder := "/usr/local/etc/telegraf/telegraf.d" + + if runtime.GOOS == "windows" { + programFiles := os.Getenv("ProgramFiles") diff --git a/net-mgmt/telegraf/files/telegraf.in b/net-mgmt/telegraf/files/telegraf.in index 5b6216b4580f..e673a12cbd86 100644 --- a/net-mgmt/telegraf/files/telegraf.in +++ b/net-mgmt/telegraf/files/telegraf.in @@ -50,6 +50,10 @@ stop_cmd="telegraf_stop" telegraf_prestart() { + if [ ! -r "${telegraf_conf}" ]; then + echo WARNING: missing ${telegraf} configuration. Start aborted. + exit 1 + fi install -d -o ${telegraf_user} -g ${telegraf_group} -m750 %%TELEGRAF_LOGDIR%% } |