From 5da74ca4ad95a7b8c73c5fb80e57466c71abf9e8 Mon Sep 17 00:00:00 2001 From: Niklas Thorild Date: Tue, 21 Oct 2025 15:42:46 +0200 Subject: [PATCH] telegraf: update to 1.36.3 - Update Telegraf to v1.36.3 Signed-off-by: Niklas Thorild --- utils/telegraf/Makefile | 6 +- utils/telegraf/files/etc/telegraf.conf | 130 ++++++++++++++----------- 2 files changed, 74 insertions(+), 62 deletions(-) diff --git a/utils/telegraf/Makefile b/utils/telegraf/Makefile index 59121cca2e..cff5d9cb7d 100644 --- a/utils/telegraf/Makefile +++ b/utils/telegraf/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=telegraf -PKG_VERSION:=1.36.2 +PKG_VERSION:=1.36.3 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:=f4d0f3c430a0a8a9f8888c6e6038f8ce58111c1f3bbf222799ed965df94afdca +PKG_HASH:=bbf1ff269da3c55101d171fedae8f74b20a00b3e33823ac9eddbe248bf4fc76b PKG_MAINTAINER:=Niklas Thorild PKG_LICENSE:=MIT @@ -23,7 +23,7 @@ GO_PKG_BUILD_PKG:=github.com/influxdata/telegraf/cmd/telegraf 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=8bdd0265 + github.com/influxdata/telegraf/internal.Commit=70e4469a ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y) TARGET_LDFLAGS += -static diff --git a/utils/telegraf/files/etc/telegraf.conf b/utils/telegraf/files/etc/telegraf.conf index ed2ab3a376..392f018c8a 100644 --- a/utils/telegraf/files/etc/telegraf.conf +++ b/utils/telegraf/files/etc/telegraf.conf @@ -5638,65 +5638,6 @@ # # include_fields = [] -# # Read metrics about docker containers -# [[inputs.docker]] -# ## Docker Endpoint -# ## To use TCP, set endpoint = "tcp://[ip]:[port]" -# ## To use environment variables (ie, docker-machine), set endpoint = "ENV" -# endpoint = "unix:///var/run/docker.sock" -# -# ## Set to true to collect Swarm metrics(desired_replicas, running_replicas) -# ## Note: configure this in one of the manager nodes in a Swarm cluster. -# ## configuring in multiple Swarm managers results in duplication of metrics. -# gather_services = false -# -# ## Set the source tag for the metrics to the container ID hostname, eg first 12 chars -# source_tag = false -# -# ## Containers to include and exclude. Collect all if empty. Globs accepted. -# container_name_include = [] -# container_name_exclude = [] -# -# ## Container states to include and exclude. Globs accepted. -# ## When empty only containers in the "running" state will be captured. -# ## example: container_state_include = ["created", "restarting", "running", "removing", "paused", "exited", "dead"] -# ## example: container_state_exclude = ["created", "restarting", "running", "removing", "paused", "exited", "dead"] -# # container_state_include = [] -# # container_state_exclude = [] -# -# ## Objects to include for disk usage query -# ## Allowed values are "container", "image", "volume" -# ## When empty disk usage is excluded -# storage_objects = [] -# -# ## Timeout for docker list, info, and stats commands -# timeout = "5s" -# -# ## Specifies for which classes a per-device metric should be issued -# ## Possible values are 'cpu' (cpu0, cpu1, ...), 'blkio' (8:0, 8:1, ...) and 'network' (eth0, eth1, ...) -# # perdevice_include = ["cpu"] -# -# ## Specifies for which classes a total metric should be issued. Total is an aggregated of the 'perdevice_include' values. -# ## Possible values are 'cpu', 'blkio' and 'network' -# ## Total 'cpu' is reported directly by Docker daemon, and 'network' and 'blkio' totals are aggregated by this plugin. -# # total_include = ["cpu", "blkio", "network"] -# -# ## docker labels to include and exclude as tags. Globs accepted. -# ## Note that an empty array for both will include all labels as tags -# docker_label_include = [] -# docker_label_exclude = [] -# -# ## Which environment variables should we use as a tag -# tag_env = ["JAVA_HOME", "HEAP_SIZE"] -# -# ## Optional TLS Config -# # tls_ca = "/etc/telegraf/ca.pem" -# # tls_cert = "/etc/telegraf/cert.pem" -# # tls_key = "/etc/telegraf/key.pem" -# ## Use TLS but skip chain & host verification -# # insecure_skip_verify = false - - # # Read metrics about dovecot servers # [[inputs.dovecot]] # ## specify dovecot servers via an address:port list @@ -9807,6 +9748,12 @@ # # ## By default, don't gather dataset stats # # datasetMetrics = false +# +# ## Report fields as the type defined by ZFS (Linux only) +# ## This is disabled for backward compatibility but is STRONGLY RECOMMENDED +# ## to be enabled to avoid overflows. This requires UINT support on the output +# ## for most fields. +# ## useNativeTypes = false # # Reads 'mntr' stats from one or many zookeeper servers @@ -10570,6 +10517,71 @@ # data_format = "influx" +# # Read metrics about docker containers +# [[inputs.docker]] +# ## Docker Endpoint +# ## To use TCP, set endpoint = "tcp://[ip]:[port]" +# ## To use environment variables (ie, docker-machine), set endpoint = "ENV" +# endpoint = "unix:///var/run/docker.sock" +# +# ## Set to true to collect Swarm metrics(desired_replicas, running_replicas) +# ## Note: configure this in one of the manager nodes in a Swarm cluster. +# ## configuring in multiple Swarm managers results in duplication of metrics. +# gather_services = false +# +# ## Set the source tag for the metrics to the container ID hostname, eg first 12 chars +# source_tag = false +# +# ## Containers to include and exclude. Collect all if empty. Globs accepted. +# container_name_include = [] +# container_name_exclude = [] +# +# ## Container states to include and exclude. Globs accepted. +# ## When empty only containers in the "running" state will be captured. +# ## example: container_state_include = ["created", "restarting", "running", "removing", "paused", "exited", "dead"] +# ## example: container_state_exclude = ["created", "restarting", "running", "removing", "paused", "exited", "dead"] +# # container_state_include = [] +# # container_state_exclude = [] +# +# ## Objects to include for disk usage query +# ## Allowed values are "container", "image", "volume" +# ## When empty disk usage is excluded +# storage_objects = [] +# +# ## Timeout for docker list, info, and stats commands +# timeout = "5s" +# +# ## Podman compatibility settings (auto-enabled when Podman detected) +# ## Cache TTL for accurate CPU percentage calculation (default: 60s) +# ## Set higher than your collection interval for accurate measurements +# ## Set to 0 to keep cache entries forever (not recommended for dynamic environments) +# # podman_cache_ttl = "60s" +# +# ## Specifies for which classes a per-device metric should be issued +# ## Possible values are 'cpu' (cpu0, cpu1, ...), 'blkio' (8:0, 8:1, ...) and 'network' (eth0, eth1, ...) +# # perdevice_include = ["cpu"] +# +# ## Specifies for which classes a total metric should be issued. Total is an aggregated of the 'perdevice_include' values. +# ## Possible values are 'cpu', 'blkio' and 'network' +# ## Total 'cpu' is reported directly by Docker daemon, and 'network' and 'blkio' totals are aggregated by this plugin. +# # total_include = ["cpu", "blkio", "network"] +# +# ## docker labels to include and exclude as tags. Globs accepted. +# ## Note that an empty array for both will include all labels as tags +# docker_label_include = [] +# docker_label_exclude = [] +# +# ## Which environment variables should we use as a tag +# tag_env = ["JAVA_HOME", "HEAP_SIZE"] +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false + + # # Read logging output from the Docker engine # [[inputs.docker_log]] # ## Docker Endpoint -- 2.30.2