telegraf: update to 1.35.4

- Update Telegraf to v1.35.4
- Adjust GO_PKG_LDFLAGS_X to reflect upstream changes in version metadata
- Add default configuration file (Telegraf no longer includes one)
- Drop deprecated tcp_listener and udp_listener plugins from telegraf-small
- Rework how plugins for small variant are specified to reflect upstream changes
- Add -static TARGET_LDFLAGS for MIPS target to avoid R_MIPS_26 relocation errors during build

Signed-off-by: Niklas Thorild <niklas@thorild.se>

utils/telegraf/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=telegraf
-PKG_VERSION:=1.23.4
+PKG_VERSION:=1.35.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/influxdata/telegraf/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=05188b5f0c0dfa204dc6bd8429ebc5366b73e42c7bdd4f1a50fffa2a1e75616f
+PKG_HASH:=8f65d493ec0597369cea6fec8a9dfef2fc8833a44cc9291f13397481635f2a6d
 
 PKG_MAINTAINER:=Jonathan Pagel <jonny_tischbein@systemli.org>
 PKG_LICENSE:=MIT
@@ -20,7 +20,47 @@ PKG_BUILD_FLAGS:=no-mips16
 
 GO_PKG:=github.com/influxdata/telegraf
 GO_PKG_BUILD_PKG:=github.com/influxdata/telegraf/cmd/telegraf
-GO_PKG_LDFLAGS_X:=main.version=$(PKG_VERSION)
+GO_PKG_LDFLAGS_X := \
+  github.com/influxdata/telegraf/internal.Version=$(PKG_VERSION) \
+  github.com/influxdata/telegraf/internal.Branch=HEAD \
+  github.com/influxdata/telegraf/internal.Commit=c93eb6a0
+
+ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
+  TARGET_LDFLAGS += -static
+endif
+
+TELEGRAF_SMALL_PLUGINS:=custom \
+	inputs.cpu \
+	inputs.ethtool \
+	inputs.internal \
+	inputs.interrupts \
+	inputs.ipset \
+	inputs.iptables \
+	inputs.kernel \
+	inputs.mem \
+	inputs.net \
+	inputs.net_response \
+	inputs.ping \
+	inputs.processes \
+	inputs.procstat \
+	inputs.prometheus \
+	inputs.sensors \
+	inputs.snmp \
+	inputs.socket_listener \
+	inputs.swap \
+	inputs.syslog \
+	inputs.system \
+	inputs.tail \
+	inputs.wireguard \
+	inputs.wireless \
+	outputs.exec \
+	outputs.file \
+	outputs.graphite \
+	outputs.http \
+	outputs.influxdb \
+	outputs.influxdb_v2 \
+	outputs.prometheus_client \
+	outputs.syslog
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk
@@ -67,16 +107,19 @@ Package/telegraf-full/conffiles = $(Package/telegraf/conffiles)
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
-ifeq ($(BUILD_VARIANT),small)
-	$(CP) ./variant-$(BUILD_VARIANT)/* $(PKG_BUILD_DIR)/
-endif
 endef
 
+ifeq ($(BUILD_VARIANT),small)
+	GO_PKG_TAGS:=$(TELEGRAF_SMALL_PLUGINS)
+else
+	GO_PKG_TAGS:=
+endif
+
 define Package/telegraf/install
 	$(call GoPackage/Package/Install/Bin,$(1))
 	$(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config
 	$(INSTALL_BIN) ./files/etc/init.d/telegraf $(1)/etc/init.d/telegraf
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/etc/telegraf.conf $(1)/etc/telegraf.conf
+	$(INSTALL_CONF) ./files/etc/telegraf.conf $(1)/etc/telegraf.conf
 endef
 
 define Package/telegraf-full/install

utils/telegraf/variant-small/plugins/aggregators/all/all.go

@@ -1,5 +0,0 @@
-package all
-
-import (
-	//Blank imports for plugins to register themselves
-)

utils/telegraf/variant-small/plugins/inputs/all/all.go

@@ -1,30 +0,0 @@
-package all
-
-import (
-	//Blank imports for plugins to register themselves
-	_ "github.com/influxdata/telegraf/plugins/inputs/cpu"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ethtool"
-	_ "github.com/influxdata/telegraf/plugins/inputs/internal"
-	_ "github.com/influxdata/telegraf/plugins/inputs/interrupts"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ipset"
-	_ "github.com/influxdata/telegraf/plugins/inputs/iptables"
-	_ "github.com/influxdata/telegraf/plugins/inputs/kernel"
-	_ "github.com/influxdata/telegraf/plugins/inputs/mem"
-	_ "github.com/influxdata/telegraf/plugins/inputs/net"
-	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
-	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
-	_ "github.com/influxdata/telegraf/plugins/inputs/processes"
-	_ "github.com/influxdata/telegraf/plugins/inputs/procstat"
-	_ "github.com/influxdata/telegraf/plugins/inputs/prometheus"
-	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
-	_ "github.com/influxdata/telegraf/plugins/inputs/snmp"
-	_ "github.com/influxdata/telegraf/plugins/inputs/socket_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/swap"
-	_ "github.com/influxdata/telegraf/plugins/inputs/syslog"
-	_ "github.com/influxdata/telegraf/plugins/inputs/system"
-	_ "github.com/influxdata/telegraf/plugins/inputs/tail"
-	_ "github.com/influxdata/telegraf/plugins/inputs/tcp_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/udp_listener"
-	_ "github.com/influxdata/telegraf/plugins/inputs/wireguard"
-	_ "github.com/influxdata/telegraf/plugins/inputs/wireless"
-)

utils/telegraf/variant-small/plugins/outputs/all/all.go

@@ -1,13 +0,0 @@
-package all
-
-import (
-	//Blank imports for plugins to register themselves
-	_ "github.com/influxdata/telegraf/plugins/outputs/exec"
-	_ "github.com/influxdata/telegraf/plugins/outputs/file"
-	_ "github.com/influxdata/telegraf/plugins/outputs/graphite"
-	_ "github.com/influxdata/telegraf/plugins/outputs/http"
-	_ "github.com/influxdata/telegraf/plugins/outputs/influxdb"
-	_ "github.com/influxdata/telegraf/plugins/outputs/influxdb_v2"
-	_ "github.com/influxdata/telegraf/plugins/outputs/prometheus_client"
-	_ "github.com/influxdata/telegraf/plugins/outputs/syslog"
-)

utils/telegraf/variant-small/plugins/processors/all/all.go

@@ -1,5 +0,0 @@
-package all
-
-import (
-	//Blank imports for plugins to register themselves
-)