CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Update removal dates to either v1.35.0 or v1.40.0 (#15452)

This commit is contained in:
Joshua Powers 2024-06-05 14:19:47 -06:00 committed by GitHub
parent c663680071
commit 71718fba7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
44 changed files with 90 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/config.go
View File

@ -212,12 +212,12 @@ type AgentConfig struct {
// FlushBufferWhenFull tells Telegraf to flush the metric buffer whenever // FlushBufferWhenFull tells Telegraf to flush the metric buffer whenever
// it fills up, regardless of FlushInterval. Setting this option to true // it fills up, regardless of FlushInterval. Setting this option to true
// does _not_ deactivate FlushInterval. // does _not_ deactivate FlushInterval.
FlushBufferWhenFull bool `toml:"flush_buffer_when_full" deprecated:"0.13.0;1.30.0;option is ignored"` FlushBufferWhenFull bool `toml:"flush_buffer_when_full" deprecated:"0.13.0;1.35.0;option is ignored"`
// TODO(cam): Remove UTC and parameter, they are no longer // TODO(cam): Remove UTC and parameter, they are no longer
// valid for the agent config. Leaving them here for now for backwards- // valid for the agent config. Leaving them here for now for backwards-
// compatibility // compatibility
UTC bool `toml:"utc" deprecated:"1.0.0;option is ignored"` UTC bool `toml:"utc" deprecated:"1.0.0;1.35.0;option is ignored"`
// Debug is the option for running in debug mode // Debug is the option for running in debug mode
Debug bool `toml:"debug"` Debug bool `toml:"debug"`
@ -552,7 +552,7 @@ func (c *Config) LoadConfigData(data []byte) error {
if c.Agent.SnmpTranslator == "netsnmp" { if c.Agent.SnmpTranslator == "netsnmp" {
PrintOptionValueDeprecationNotice("agent", "snmp_translator", "netsnmp", telegraf.DeprecationInfo{ PrintOptionValueDeprecationNotice("agent", "snmp_translator", "netsnmp", telegraf.DeprecationInfo{
Since: "1.25.0", Since: "1.25.0",
RemovalIn: "2.0.0", RemovalIn: "1.40.0",
Notice: "Use 'gosmi' instead", Notice: "Use 'gosmi' instead",
}) })
} }
@ -1394,7 +1394,7 @@ func (c *Config) buildFilter(plugin string, tbl *ast.Table) (models.Filter, erro
if len(oldPass) > 0 { if len(oldPass) > 0 {
PrintOptionDeprecationNotice(plugin, "pass", telegraf.DeprecationInfo{ PrintOptionDeprecationNotice(plugin, "pass", telegraf.DeprecationInfo{
Since: "0.10.4", Since: "0.10.4",
RemovalIn: "2.0.0", RemovalIn: "1.35.0",
Notice: "use 'fieldinclude' instead", Notice: "use 'fieldinclude' instead",
}) })
f.FieldInclude = append(f.FieldInclude, oldPass...) f.FieldInclude = append(f.FieldInclude, oldPass...)
@ -1404,7 +1404,7 @@ func (c *Config) buildFilter(plugin string, tbl *ast.Table) (models.Filter, erro
if len(oldFieldPass) > 0 { if len(oldFieldPass) > 0 {
PrintOptionDeprecationNotice(plugin, "fieldpass", telegraf.DeprecationInfo{ PrintOptionDeprecationNotice(plugin, "fieldpass", telegraf.DeprecationInfo{
Since: "1.29.0", Since: "1.29.0",
RemovalIn: "2.0.0", RemovalIn: "1.40.0",
Notice: "use 'fieldinclude' instead", Notice: "use 'fieldinclude' instead",
}) })
f.FieldInclude = append(f.FieldInclude, oldFieldPass...) f.FieldInclude = append(f.FieldInclude, oldFieldPass...)
@ -1416,7 +1416,7 @@ func (c *Config) buildFilter(plugin string, tbl *ast.Table) (models.Filter, erro
if len(oldDrop) > 0 { if len(oldDrop) > 0 {
PrintOptionDeprecationNotice(plugin, "drop", telegraf.DeprecationInfo{ PrintOptionDeprecationNotice(plugin, "drop", telegraf.DeprecationInfo{
Since: "0.10.4", Since: "0.10.4",
RemovalIn: "2.0.0", RemovalIn: "1.35.0",
Notice: "use 'fieldexclude' instead", Notice: "use 'fieldexclude' instead",
}) })
f.FieldExclude = append(f.FieldExclude, oldDrop...) f.FieldExclude = append(f.FieldExclude, oldDrop...)
@ -1426,7 +1426,7 @@ func (c *Config) buildFilter(plugin string, tbl *ast.Table) (models.Filter, erro
if len(oldFieldDrop) > 0 { if len(oldFieldDrop) > 0 {
PrintOptionDeprecationNotice(plugin, "fielddrop", telegraf.DeprecationInfo{ PrintOptionDeprecationNotice(plugin, "fielddrop", telegraf.DeprecationInfo{
Since: "1.29.0", Since: "1.29.0",
RemovalIn: "2.0.0", RemovalIn: "1.40.0",
Notice: "use 'fieldexclude' instead", Notice: "use 'fieldexclude' instead",
}) })
f.FieldExclude = append(f.FieldExclude, oldFieldDrop...) f.FieldExclude = append(f.FieldExclude, oldFieldDrop...)

8
plugins/common/opcua/input/input_client.go
View File

@ -52,9 +52,9 @@ type NodeSettings struct {
Namespace string `toml:"namespace"` Namespace string `toml:"namespace"`
IdentifierType string `toml:"identifier_type"` IdentifierType string `toml:"identifier_type"`
Identifier string `toml:"identifier"` Identifier string `toml:"identifier"`
DataType string `toml:"data_type" deprecated:"1.17.0;option is ignored"` DataType string `toml:"data_type" deprecated:"1.17.0;1.35.0;option is ignored"`
Description string `toml:"description" deprecated:"1.17.0;option is ignored"` Description string `toml:"description" deprecated:"1.17.0;1.35.0;option is ignored"`
TagsSlice [][]string `toml:"tags" deprecated:"1.25.0;use 'default_tags' instead"` TagsSlice [][]string `toml:"tags" deprecated:"1.25.0;1.35.0;use 'default_tags' instead"`
DefaultTags map[string]string `toml:"default_tags"` DefaultTags map[string]string `toml:"default_tags"`
MonitoringParams MonitoringParameters `toml:"monitoring_params"` MonitoringParams MonitoringParameters `toml:"monitoring_params"`
} }
@ -70,7 +70,7 @@ type NodeGroupSettings struct {
Namespace string `toml:"namespace"` // Can be overridden by node setting Namespace string `toml:"namespace"` // Can be overridden by node setting
IdentifierType string `toml:"identifier_type"` // Can be overridden by node setting IdentifierType string `toml:"identifier_type"` // Can be overridden by node setting
Nodes []NodeSettings `toml:"nodes"` Nodes []NodeSettings `toml:"nodes"`
TagsSlice [][]string `toml:"tags" deprecated:"1.26.0;use default_tags"` TagsSlice [][]string `toml:"tags" deprecated:"1.26.0;1.35.0;use default_tags"`
DefaultTags map[string]string `toml:"default_tags"` DefaultTags map[string]string `toml:"default_tags"`
SamplingInterval config.Duration `toml:"sampling_interval"` // Can be overridden by monitoring parameters SamplingInterval config.Duration `toml:"sampling_interval"` // Can be overridden by monitoring parameters
} }

6
plugins/common/tls/config.go
View File

@ -29,9 +29,9 @@ type ClientConfig struct {
RenegotiationMethod string `toml:"tls_renegotiation_method"` RenegotiationMethod string `toml:"tls_renegotiation_method"`
Enable *bool `toml:"tls_enable"` Enable *bool `toml:"tls_enable"`
SSLCA string `toml:"ssl_ca" deprecated:"1.7.0;use 'tls_ca' instead"` SSLCA string `toml:"ssl_ca" deprecated:"1.7.0;1.35.0;use 'tls_ca' instead"`
SSLCert string `toml:"ssl_cert" deprecated:"1.7.0;use 'tls_cert' instead"` SSLCert string `toml:"ssl_cert" deprecated:"1.7.0;1.35.0;use 'tls_cert' instead"`
SSLKey string `toml:"ssl_key" deprecated:"1.7.0;use 'tls_key' instead"` SSLKey string `toml:"ssl_key" deprecated:"1.7.0;1.35.0;use 'tls_key' instead"`
} }
// ServerConfig represents the standard server TLS config. // ServerConfig represents the standard server TLS config.

2
plugins/inputs/aerospike/aerospike.go
View File

@ -28,7 +28,7 @@ type Aerospike struct {
Password string `toml:"password"` Password string `toml:"password"`
EnableTLS bool `toml:"enable_tls"` EnableTLS bool `toml:"enable_tls"`
EnableSSL bool `toml:"enable_ssl" deprecated:"1.7.0;use 'enable_tls' instead"` EnableSSL bool `toml:"enable_ssl" deprecated:"1.7.0;1.35.0;use 'enable_tls' instead"`
TLSName string `toml:"tls_name"` TLSName string `toml:"tls_name"`
tlsint.ClientConfig tlsint.ClientConfig

2
plugins/inputs/amqp_consumer/amqp_consumer.go
View File

@ -28,7 +28,7 @@ type semaphore chan empty
// AMQPConsumer is the top level struct for this plugin // AMQPConsumer is the top level struct for this plugin
type AMQPConsumer struct { type AMQPConsumer struct {
URL string `toml:"url" deprecated:"1.7.0;use 'brokers' instead"` URL string `toml:"url" deprecated:"1.7.0;1.35.0;use 'brokers' instead"`
Brokers []string `toml:"brokers"` Brokers []string `toml:"brokers"`
Username config.Secret `toml:"username"` Username config.Secret `toml:"username"`
Password config.Secret `toml:"password"` Password config.Secret `toml:"password"`

2
plugins/inputs/cloudwatch/cloudwatch.go
View File

@ -41,7 +41,7 @@ type CloudWatch struct {
Period config.Duration `toml:"period"` Period config.Duration `toml:"period"`
Delay config.Duration `toml:"delay"` Delay config.Duration `toml:"delay"`
Namespace string `toml:"namespace" deprecated:"1.25.0;use 'namespaces' instead"` Namespace string `toml:"namespace" deprecated:"1.25.0;1.35.0;use 'namespaces' instead"`
Namespaces []string `toml:"namespaces"` Namespaces []string `toml:"namespaces"`
Metrics []*Metric `toml:"metrics"` Metrics []*Metric `toml:"metrics"`
CacheTTL config.Duration `toml:"cache_ttl"` CacheTTL config.Duration `toml:"cache_ttl"`

2
plugins/inputs/consul/consul.go
View File

@ -22,7 +22,7 @@ type Consul struct {
Token string Token string
Username string Username string
Password string Password string
Datacentre string `toml:"datacentre" deprecated:"1.10.0;use 'datacenter' instead"` Datacentre string `toml:"datacentre" deprecated:"1.10.0;1.35.0;use 'datacenter' instead"`
Datacenter string Datacenter string
tls.ClientConfig tls.ClientConfig
TagDelimiter string TagDelimiter string

15
plugins/inputs/deprecations.go
View File

@ -5,8 +5,9 @@ import "github.com/influxdata/telegraf"
// Deprecations lists the deprecated plugins // Deprecations lists the deprecated plugins
var Deprecations = map[string]telegraf.DeprecationInfo{ var Deprecations = map[string]telegraf.DeprecationInfo{
"aerospike": { "aerospike": {
Since: "1.30.0", Since: "1.30.0",
Notice: "use 'inputs.prometheus' with the Aerospike Prometheus Exporter instead", RemovalIn: "1.40.0",
Notice: "use 'inputs.prometheus' with the Aerospike Prometheus Exporter instead",
}, },
"cassandra": { "cassandra": {
Since: "1.7.0", Since: "1.7.0",
@ -46,12 +47,14 @@ var Deprecations = map[string]telegraf.DeprecationInfo{
Notice: "has been renamed to 'knx_listener'", Notice: "has been renamed to 'knx_listener'",
}, },
"logparser": { "logparser": {
Since: "1.15.0", Since: "1.15.0",
Notice: "use 'inputs.tail' with 'grok' data format instead", RemovalIn: "1.35.0",
Notice: "use 'inputs.tail' with 'grok' data format instead",
}, },
"sflow": { "sflow": {
Since: "1.31.0", Since: "1.31.0",
Notice: "use 'inputs.netflow' instead", RemovalIn: "1.40.0",
Notice: "use 'inputs.netflow' instead",
}, },
"snmp_legacy": { "snmp_legacy": {
Since: "1.0.0", Since: "1.0.0",

6
plugins/inputs/docker/docker.go
View File

@ -36,14 +36,14 @@ var sampleConfig string
// Docker object // Docker object
type Docker struct { type Docker struct {
Endpoint string Endpoint string
ContainerNames []string `toml:"container_names" deprecated:"1.4.0;use 'container_name_include' instead"` ContainerNames []string `toml:"container_names" deprecated:"1.4.0;1.35.0;use 'container_name_include' instead"`
GatherServices bool `toml:"gather_services"` GatherServices bool `toml:"gather_services"`
Timeout config.Duration Timeout config.Duration
PerDevice bool `toml:"perdevice" deprecated:"1.18.0;use 'perdevice_include' instead"` PerDevice bool `toml:"perdevice" deprecated:"1.18.0;1.35.0;use 'perdevice_include' instead"`
PerDeviceInclude []string `toml:"perdevice_include"` PerDeviceInclude []string `toml:"perdevice_include"`
Total bool `toml:"total" deprecated:"1.18.0;use 'total_include' instead"` Total bool `toml:"total" deprecated:"1.18.0;1.35.0;use 'total_include' instead"`
TotalInclude []string `toml:"total_include"` TotalInclude []string `toml:"total_include"`
TagEnvironment []string `toml:"tag_env"` TagEnvironment []string `toml:"tag_env"`
LabelInclude []string `toml:"docker_label_include"` LabelInclude []string `toml:"docker_label_include"`

2
plugins/inputs/elasticsearch/elasticsearch.go
View File

@ -98,7 +98,7 @@ type indexStat struct {
type Elasticsearch struct { type Elasticsearch struct {
Local bool `toml:"local"` Local bool `toml:"local"`
Servers []string `toml:"servers"` Servers []string `toml:"servers"`
HTTPTimeout config.Duration `toml:"http_timeout" deprecated:"1.29.0;use 'timeout' instead"` HTTPTimeout config.Duration `toml:"http_timeout" deprecated:"1.29.0;1.35.0;use 'timeout' instead"`
ClusterHealth bool `toml:"cluster_health"` ClusterHealth bool `toml:"cluster_health"`
ClusterHealthLevel string `toml:"cluster_health_level"` ClusterHealthLevel string `toml:"cluster_health_level"`
ClusterStats bool `toml:"cluster_stats"` ClusterStats bool `toml:"cluster_stats"`

2
plugins/inputs/filecount/filecount.go
View File

@ -21,7 +21,7 @@ import (
var sampleConfig string var sampleConfig string
type FileCount struct { type FileCount struct {
Directory string `toml:"directory" deprecated:"1.9.0;use 'directories' instead"` Directory string `toml:"directory" deprecated:"1.9.0;1.35.0;use 'directories' instead"`
Directories []string Directories []string
Name string Name string
Recursive bool Recursive bool

6
plugins/inputs/gnmi/gnmi.go
View File

@ -58,9 +58,9 @@ type GNMI struct {
CanonicalFieldNames bool `toml:"canonical_field_names"` CanonicalFieldNames bool `toml:"canonical_field_names"`
TrimFieldNames bool `toml:"trim_field_names"` TrimFieldNames bool `toml:"trim_field_names"`
PrefixTagKeyWithPath bool `toml:"prefix_tag_key_with_path"` PrefixTagKeyWithPath bool `toml:"prefix_tag_key_with_path"`
GuessPathTag bool `toml:"guess_path_tag" deprecated:"1.30.0;use 'path_guessing_strategy' instead"` GuessPathTag bool `toml:"guess_path_tag" deprecated:"1.30.0;1.35.0;use 'path_guessing_strategy' instead"`
GuessPathStrategy string `toml:"path_guessing_strategy"` GuessPathStrategy string `toml:"path_guessing_strategy"`
EnableTLS bool `toml:"enable_tls" deprecated:"1.27.0;use 'tls_enable' instead"` EnableTLS bool `toml:"enable_tls" deprecated:"1.27.0;1.35.0;use 'tls_enable' instead"`
KeepaliveTime config.Duration `toml:"keepalive_time"` KeepaliveTime config.Duration `toml:"keepalive_time"`
KeepaliveTimeout config.Duration `toml:"keepalive_timeout"` KeepaliveTimeout config.Duration `toml:"keepalive_timeout"`
YangModelPaths []string `toml:"yang_model_paths"` YangModelPaths []string `toml:"yang_model_paths"`
@ -83,7 +83,7 @@ type Subscription struct {
SampleInterval config.Duration `toml:"sample_interval"` SampleInterval config.Duration `toml:"sample_interval"`
SuppressRedundant bool `toml:"suppress_redundant"` SuppressRedundant bool `toml:"suppress_redundant"`
HeartbeatInterval config.Duration `toml:"heartbeat_interval"` HeartbeatInterval config.Duration `toml:"heartbeat_interval"`
TagOnly bool `toml:"tag_only" deprecated:"1.25.0;2.0.0;please use 'tag_subscription's instead"` TagOnly bool `toml:"tag_only" deprecated:"1.25.0;1.35.0;please use 'tag_subscription's instead"`
fullPath *gnmiLib.Path fullPath *gnmiLib.Path
} }

2
plugins/inputs/http/http.go
View File

@ -34,7 +34,7 @@ type HTTP struct {
Password config.Secret `toml:"password"` Password config.Secret `toml:"password"`
// Bearer authentication // Bearer authentication
BearerToken string `toml:"bearer_token" deprecated:"1.28.0;use 'token_file' instead"` BearerToken string `toml:"bearer_token" deprecated:"1.28.0;1.35.0;use 'token_file' instead"`
Token config.Secret `toml:"token"` Token config.Secret `toml:"token"`
TokenFile string `toml:"token_file"` TokenFile string `toml:"token_file"`

2
plugins/inputs/http_listener_v2/http_listener_v2.go
View File

@ -44,7 +44,7 @@ type TimeFunc func() time.Time
// HTTPListenerV2 is an input plugin that collects external metrics sent via HTTP // HTTPListenerV2 is an input plugin that collects external metrics sent via HTTP
type HTTPListenerV2 struct { type HTTPListenerV2 struct {
ServiceAddress string `toml:"service_address"` ServiceAddress string `toml:"service_address"`
Path string `toml:"path" deprecated:"1.20.0;use 'paths' instead"` Path string `toml:"path" deprecated:"1.20.0;1.35.0;use 'paths' instead"`
Paths []string `toml:"paths"` Paths []string `toml:"paths"`
PathTag bool `toml:"path_tag"` PathTag bool `toml:"path_tag"`
Methods []string `toml:"methods"` Methods []string `toml:"methods"`

2
plugins/inputs/http_response/http_response.go
View File

@ -36,7 +36,7 @@ const (
// HTTPResponse struct // HTTPResponse struct
type HTTPResponse struct { type HTTPResponse struct {
Address string `toml:"address" deprecated:"1.12.0;use 'urls' instead"` Address string `toml:"address" deprecated:"1.12.0;1.35.0;use 'urls' instead"`
URLs []string `toml:"urls"` URLs []string `toml:"urls"`
HTTPProxy string `toml:"http_proxy"` HTTPProxy string `toml:"http_proxy"`
Body string Body string

2
plugins/inputs/icinga2/icinga2.go
View File

@ -25,7 +25,7 @@ type Icinga2 struct {
Server string Server string
Objects []string Objects []string
Status []string Status []string
ObjectType string `toml:"object_type" deprecated:"1.26.0;2.0.0;use 'objects' instead"` ObjectType string `toml:"object_type" deprecated:"1.26.0;1.35.0;use 'objects' instead"`
Username string Username string
Password string Password string
ResponseTimeout config.Duration ResponseTimeout config.Duration

2
plugins/inputs/influxdb_listener/influxdb_listener.go
View File

@ -40,7 +40,7 @@ type InfluxDBListener struct {
ReadTimeout config.Duration `toml:"read_timeout"` ReadTimeout config.Duration `toml:"read_timeout"`
WriteTimeout config.Duration `toml:"write_timeout"` WriteTimeout config.Duration `toml:"write_timeout"`
MaxBodySize config.Size `toml:"max_body_size"` MaxBodySize config.Size `toml:"max_body_size"`
MaxLineSize config.Size `toml:"max_line_size" deprecated:"1.14.0;parser now handles lines of unlimited length and option is ignored"` MaxLineSize config.Size `toml:"max_line_size" deprecated:"1.14.0;1.35.0;parser now handles lines of unlimited length and option is ignored"`
BasicUsername string `toml:"basic_username"` BasicUsername string `toml:"basic_username"`
BasicPassword string `toml:"basic_password"` BasicPassword string `toml:"basic_password"`
TokenSharedSecret string `toml:"token_shared_secret"` TokenSharedSecret string `toml:"token_shared_secret"`

2
plugins/inputs/intel_powerstat/intel_powerstat.go
View File

@ -240,7 +240,7 @@ func (p *PowerStat) parseCPUMetrics() error {
if slices.Contains(p.CPUMetrics, cpuBusyCycles) { if slices.Contains(p.CPUMetrics, cpuBusyCycles) {
config.PrintOptionValueDeprecationNotice("inputs.intel_powerstat", "cpu_metrics", cpuBusyCycles, telegraf.DeprecationInfo{ config.PrintOptionValueDeprecationNotice("inputs.intel_powerstat", "cpu_metrics", cpuBusyCycles, telegraf.DeprecationInfo{
Since: "1.23.0", Since: "1.23.0",
RemovalIn: "2.0.0", RemovalIn: "1.35.0;",
Notice: "'cpu_c0_state_residency' metric name should be used instead.", Notice: "'cpu_c0_state_residency' metric name should be used instead.",
}) })
} }

2
plugins/inputs/internet_speed/internet_speed.go
View File

@ -26,7 +26,7 @@ var sampleConfig string
type InternetSpeed struct { type InternetSpeed struct {
ServerIDInclude []string `toml:"server_id_include"` ServerIDInclude []string `toml:"server_id_include"`
ServerIDExclude []string `toml:"server_id_exclude"` ServerIDExclude []string `toml:"server_id_exclude"`
EnableFileDownload bool `toml:"enable_file_download" deprecated:"1.25.0;use 'memory_saving_mode' instead"` EnableFileDownload bool `toml:"enable_file_download" deprecated:"1.25.0;1.35.0;use 'memory_saving_mode' instead"`
MemorySavingMode bool `toml:"memory_saving_mode"` MemorySavingMode bool `toml:"memory_saving_mode"`
Cache bool `toml:"cache"` Cache bool `toml:"cache"`
Connections int `toml:"connections"` Connections int `toml:"connections"`

2
plugins/inputs/kube_inventory/kube_inventory.go
View File

@ -32,7 +32,7 @@ type KubernetesInventory struct {
URL string `toml:"url"` URL string `toml:"url"`
KubeletURL string `toml:"url_kubelet"` KubeletURL string `toml:"url_kubelet"`
BearerToken string `toml:"bearer_token"` BearerToken string `toml:"bearer_token"`
BearerTokenString string `toml:"bearer_token_string" deprecated:"1.24.0;use 'BearerToken' with a file instead"` BearerTokenString string `toml:"bearer_token_string" deprecated:"1.24.0;1.35.0;use 'BearerToken' with a file instead"`
Namespace string `toml:"namespace"` Namespace string `toml:"namespace"`
ResponseTimeout config.Duration `toml:"response_timeout"` // Timeout specified as a string - 3s, 1m, 1h ResponseTimeout config.Duration `toml:"response_timeout"` // Timeout specified as a string - 3s, 1m, 1h
ResourceExclude []string `toml:"resource_exclude"` ResourceExclude []string `toml:"resource_exclude"`

2
plugins/inputs/kubernetes/kubernetes.go
View File

@ -31,7 +31,7 @@ var sampleConfig string
type Kubernetes struct { type Kubernetes struct {
URL string `toml:"url"` URL string `toml:"url"`
BearerToken string `toml:"bearer_token"` BearerToken string `toml:"bearer_token"`
BearerTokenString string `toml:"bearer_token_string" deprecated:"1.24.0;use 'BearerToken' with a file instead"` BearerTokenString string `toml:"bearer_token_string" deprecated:"1.24.0;1.35.0;use 'BearerToken' with a file instead"`
NodeMetricName string `toml:"node_metric_name"` NodeMetricName string `toml:"node_metric_name"`
LabelInclude []string `toml:"label_include"` LabelInclude []string `toml:"label_include"`
LabelExclude []string `toml:"label_exclude"` LabelExclude []string `toml:"label_exclude"`

4
plugins/inputs/mock/mock.go
View File

@ -53,8 +53,8 @@ type step struct {
Start float64 `toml:"start"` Start float64 `toml:"start"`
Step float64 `toml:"step"` Step float64 `toml:"step"`
Min float64 `toml:"min" deprecated:"1.28.2;use 'start' instead"` Min float64 `toml:"min" deprecated:"1.28.2;1.35.0;use 'start' instead"`
Max float64 `toml:"max" deprecated:"1.28.2;use 'step' instead"` Max float64 `toml:"max" deprecated:"1.28.2;1.35.0;use 'step' instead"`
} }
type stock struct { type stock struct {

2
plugins/inputs/modbus/configuration_register.go
View File

@ -271,7 +271,7 @@ func (c *ConfigurationOriginal) normalizeInputDatatype(dataType string, words in
if dataType == "FLOAT32" { if dataType == "FLOAT32" {
config.PrintOptionValueDeprecationNotice("input.modbus", "data_type", "FLOAT32", telegraf.DeprecationInfo{ config.PrintOptionValueDeprecationNotice("input.modbus", "data_type", "FLOAT32", telegraf.DeprecationInfo{
Since: "v1.16.0", Since: "v1.16.0",
RemovalIn: "v2.0.0", RemovalIn: "v1.35.0",
Notice: "Use 'UFIXED' instead", Notice: "Use 'UFIXED' instead",
}) })
} }

4
plugins/inputs/mongodb/mongodb.go
View File

@ -46,8 +46,8 @@ type MongoDB struct {
} }
type Ssl struct { type Ssl struct {
Enabled bool `toml:"ssl_enabled" deprecated:"1.3.0;use 'tls_*' options instead"` Enabled bool `toml:"ssl_enabled" deprecated:"1.3.0;1.35.0;use 'tls_*' options instead"`
CaCerts []string `toml:"cacerts" deprecated:"1.3.0;use 'tls_ca' instead"` CaCerts []string `toml:"cacerts" deprecated:"1.3.0;1.35.0;use 'tls_ca' instead"`
} }
func (*MongoDB) SampleConfig() string { func (*MongoDB) SampleConfig() string {

2
plugins/inputs/nsq_consumer/nsq_consumer.go
View File

@ -34,7 +34,7 @@ func (l *logger) Output(_ int, s string) error {
// NSQConsumer represents the configuration of the plugin // NSQConsumer represents the configuration of the plugin
type NSQConsumer struct { type NSQConsumer struct {
Server string `toml:"server" deprecated:"1.5.0;use 'nsqd' instead"` Server string `toml:"server" deprecated:"1.5.0;1.35.0;use 'nsqd' instead"`
Nsqd []string `toml:"nsqd"` Nsqd []string `toml:"nsqd"`
Nsqlookupd []string `toml:"nsqlookupd"` Nsqlookupd []string `toml:"nsqlookupd"`
Topic string `toml:"topic"` Topic string `toml:"topic"`

2
plugins/inputs/ntpq/ntpq.go
View File

@ -64,7 +64,7 @@ var fieldElements = map[string]elementType{
} }
type NTPQ struct { type NTPQ struct {
DNSLookup bool `toml:"dns_lookup" deprecated:"1.24.0;add '-n' to 'options' instead to skip DNS lookup"` DNSLookup bool `toml:"dns_lookup" deprecated:"1.24.0;1.35.0;add '-n' to 'options' instead to skip DNS lookup"`
Options string `toml:"options"` Options string `toml:"options"`
Servers []string `toml:"servers"` Servers []string `toml:"servers"`
ReachFormat string `toml:"reach_format"` ReachFormat string `toml:"reach_format"`

4
plugins/inputs/openldap/openldap.go
View File

@ -20,10 +20,10 @@ var sampleConfig string
type Openldap struct { type Openldap struct {
Host string Host string
Port int Port int
SSL string `toml:"ssl" deprecated:"1.7.0;use 'tls' instead"` SSL string `toml:"ssl" deprecated:"1.7.0;1.35.0;use 'tls' instead"`
TLS string `toml:"tls"` TLS string `toml:"tls"`
InsecureSkipVerify bool InsecureSkipVerify bool
SSLCA string `toml:"ssl_ca" deprecated:"1.7.0;use 'tls_ca' instead"` SSLCA string `toml:"ssl_ca" deprecated:"1.7.0;1.35.0;use 'tls_ca' instead"`
TLSCA string `toml:"tls_ca"` TLSCA string `toml:"tls_ca"`
BindDn string BindDn string
BindPassword string BindPassword string

6
plugins/inputs/procstat/procstat.go
View File

@ -41,15 +41,15 @@ type Procstat struct {
Exe string `toml:"exe"` Exe string `toml:"exe"`
Pattern string `toml:"pattern"` Pattern string `toml:"pattern"`
Prefix string `toml:"prefix"` Prefix string `toml:"prefix"`
CmdLineTag bool `toml:"cmdline_tag" deprecated:"1.29.0;use 'tag_with' instead"` CmdLineTag bool `toml:"cmdline_tag" deprecated:"1.29.0;1.40.0;use 'tag_with' instead"`
ProcessName string `toml:"process_name"` ProcessName string `toml:"process_name"`
User string `toml:"user"` User string `toml:"user"`
SystemdUnit string `toml:"systemd_unit"` SystemdUnit string `toml:"systemd_unit"`
SupervisorUnit []string `toml:"supervisor_unit" deprecated:"1.29.0;use 'supervisor_units' instead"` SupervisorUnit []string `toml:"supervisor_unit" deprecated:"1.29.0;1.40.0;use 'supervisor_units' instead"`
SupervisorUnits []string `toml:"supervisor_units"` SupervisorUnits []string `toml:"supervisor_units"`
IncludeSystemdChildren bool `toml:"include_systemd_children"` IncludeSystemdChildren bool `toml:"include_systemd_children"`
CGroup string `toml:"cgroup"` CGroup string `toml:"cgroup"`
PidTag bool `toml:"pid_tag" deprecated:"1.29.0;use 'tag_with' instead"` PidTag bool `toml:"pid_tag" deprecated:"1.29.0;1.40.0;use 'tag_with' instead"`
WinService string `toml:"win_service"` WinService string `toml:"win_service"`
Mode string `toml:"mode"` Mode string `toml:"mode"`
Properties []string `toml:"properties"` Properties []string `toml:"properties"`

4
plugins/inputs/rabbitmq/rabbitmq.go
View File

@ -42,7 +42,7 @@ const DefaultClientTimeout = 4
// see the sample config for further details // see the sample config for further details
type RabbitMQ struct { type RabbitMQ struct {
URL string `toml:"url"` URL string `toml:"url"`
Name string `toml:"name" deprecated:"1.3.0;use 'tags' instead"` Name string `toml:"name" deprecated:"1.3.0;1.35.0;use 'tags' instead"`
Username config.Secret `toml:"username"` Username config.Secret `toml:"username"`
Password config.Secret `toml:"password"` Password config.Secret `toml:"password"`
tls.ClientConfig tls.ClientConfig
@ -51,7 +51,7 @@ type RabbitMQ struct {
ClientTimeout config.Duration `toml:"client_timeout"` ClientTimeout config.Duration `toml:"client_timeout"`
Nodes []string `toml:"nodes"` Nodes []string `toml:"nodes"`
Queues []string `toml:"queues" deprecated:"1.6.0;use 'queue_name_include' instead"` Queues []string `toml:"queues" deprecated:"1.6.0;1.35.0;use 'queue_name_include' instead"`
Exchanges []string `toml:"exchanges"` Exchanges []string `toml:"exchanges"`
MetricInclude []string `toml:"metric_include"` MetricInclude []string `toml:"metric_include"`

2
plugins/inputs/smart/smart.go
View File

@ -358,7 +358,7 @@ var (
// Smart plugin reads metrics from storage devices supporting S.M.A.R.T. // Smart plugin reads metrics from storage devices supporting S.M.A.R.T.
type Smart struct { type Smart struct {
Path string `toml:"path" deprecated:"1.16.0;use 'path_smartctl' instead"` Path string `toml:"path" deprecated:"1.16.0;1.35.0;use 'path_smartctl' instead"`
PathSmartctl string `toml:"path_smartctl"` PathSmartctl string `toml:"path_smartctl"`
PathNVMe string `toml:"path_nvme"` PathNVMe string `toml:"path_nvme"`
Nocheck string `toml:"nocheck"` Nocheck string `toml:"nocheck"`

2
plugins/inputs/snmp_trap/snmp_trap.go
View File

@ -43,7 +43,7 @@ func (l wrapLog) Print(args ...interface{}) {
type SnmpTrap struct { type SnmpTrap struct {
ServiceAddress string `toml:"service_address"` ServiceAddress string `toml:"service_address"`
Timeout config.Duration `toml:"timeout" deprecated:"1.20.0;unused option"` Timeout config.Duration `toml:"timeout" deprecated:"1.20.0;1.35.0;unused option"`
Version string `toml:"version"` Version string `toml:"version"`
Translator string `toml:"-"` Translator string `toml:"-"`
Path []string `toml:"path"` Path []string `toml:"path"`

4
plugins/inputs/sqlserver/sqlserver.go
View File

@ -28,8 +28,8 @@ type SQLServer struct {
Servers []*config.Secret `toml:"servers"` Servers []*config.Secret `toml:"servers"`
QueryTimeout config.Duration `toml:"query_timeout"` QueryTimeout config.Duration `toml:"query_timeout"`
AuthMethod string `toml:"auth_method"` AuthMethod string `toml:"auth_method"`
QueryVersion int `toml:"query_version" deprecated:"1.16.0;use 'database_type' instead"` QueryVersion int `toml:"query_version" deprecated:"1.16.0;1.35.0;use 'database_type' instead"`
AzureDB bool `toml:"azuredb" deprecated:"1.16.0;use 'database_type' instead"` AzureDB bool `toml:"azuredb" deprecated:"1.16.0;1.35.0;use 'database_type' instead"`
DatabaseType string `toml:"database_type"` DatabaseType string `toml:"database_type"`
IncludeQuery []string `toml:"include_query"` IncludeQuery []string `toml:"include_query"`
ExcludeQuery []string `toml:"exclude_query"` ExcludeQuery []string `toml:"exclude_query"`

4
plugins/inputs/statsd/statsd.go
View File

@ -84,7 +84,7 @@ type Statsd struct {
MetricSeparator string `toml:"metric_separator"` MetricSeparator string `toml:"metric_separator"`
// This flag enables parsing of tags in the dogstatsd extension to the // This flag enables parsing of tags in the dogstatsd extension to the
// statsd protocol (http://docs.datadoghq.com/guides/dogstatsd/) // statsd protocol (http://docs.datadoghq.com/guides/dogstatsd/)
ParseDataDogTags bool `toml:"parse_data_dog_tags" deprecated:"1.10.0;use 'datadog_extensions' instead"` ParseDataDogTags bool `toml:"parse_data_dog_tags" deprecated:"1.10.0;1.35.0;use 'datadog_extensions' instead"`
// Parses extensions to statsd in the datadog statsd format // Parses extensions to statsd in the datadog statsd format
// currently supports metrics and datadog tags. // currently supports metrics and datadog tags.
@ -105,7 +105,7 @@ type Statsd struct {
// we now always create 1 max size buffer and then copy only what we need // we now always create 1 max size buffer and then copy only what we need
// into the in channel // into the in channel
// see https://github.com/influxdata/telegraf/pull/992 // see https://github.com/influxdata/telegraf/pull/992
UDPPacketSize int `toml:"udp_packet_size" deprecated:"0.12.1;2.0.0;option is ignored"` UDPPacketSize int `toml:"udp_packet_size" deprecated:"0.12.1;1.35.0;option is ignored"`
ReadBufferSize int `toml:"read_buffer_size"` ReadBufferSize int `toml:"read_buffer_size"`
SanitizeNamesMethod string `toml:"sanitize_name_method"` SanitizeNamesMethod string `toml:"sanitize_name_method"`

2
plugins/inputs/vsphere/vsphere.go
View File

@ -72,7 +72,7 @@ type VSphere struct {
MaxQueryMetrics int `toml:"max_query_metrics"` MaxQueryMetrics int `toml:"max_query_metrics"`
CollectConcurrency int `toml:"collect_concurrency"` CollectConcurrency int `toml:"collect_concurrency"`
DiscoverConcurrency int `toml:"discover_concurrency"` DiscoverConcurrency int `toml:"discover_concurrency"`
ForceDiscoverOnInit bool `toml:"force_discover_on_init" deprecated:"1.14.0;option is ignored"` ForceDiscoverOnInit bool `toml:"force_discover_on_init" deprecated:"1.14.0;1.35.0;option is ignored"`
ObjectDiscoveryInterval config.Duration `toml:"object_discovery_interval"` ObjectDiscoveryInterval config.Duration `toml:"object_discovery_interval"`
Timeout config.Duration `toml:"timeout"` Timeout config.Duration `toml:"timeout"`
HistoricalInterval config.Duration `toml:"historical_interval"` HistoricalInterval config.Duration `toml:"historical_interval"`

2
plugins/inputs/win_perf_counters/win_perf_counters.go
View File

@ -25,7 +25,7 @@ var defaultMaxBufferSize = config.Size(100 * 1024 * 1024)
type WinPerfCounters struct { type WinPerfCounters struct {
PrintValid bool `toml:"PrintValid"` PrintValid bool `toml:"PrintValid"`
PreVistaSupport bool `toml:"PreVistaSupport" deprecated:"1.7.0;determined dynamically"` PreVistaSupport bool `toml:"PreVistaSupport" deprecated:"1.7.0;1.35.0;determined dynamically"`
UsePerfCounterTime bool UsePerfCounterTime bool
Object []perfObject Object []perfObject
CountersRefreshInterval config.Duration CountersRefreshInterval config.Duration

2
plugins/inputs/zookeeper/zookeeper.go
View File

@ -31,7 +31,7 @@ type Zookeeper struct {
ParseFloats string `toml:"parse_floats"` ParseFloats string `toml:"parse_floats"`
EnableTLS bool `toml:"enable_tls"` EnableTLS bool `toml:"enable_tls"`
EnableSSL bool `toml:"enable_ssl" deprecated:"1.7.0;use 'enable_tls' instead"` EnableSSL bool `toml:"enable_ssl" deprecated:"1.7.0;1.35.0;use 'enable_tls' instead"`
tlsint.ClientConfig tlsint.ClientConfig
initialized bool initialized bool

8
plugins/outputs/amqp/amqp.go
View File

@ -42,7 +42,7 @@ func (a *externalAuth) Response() string {
} }
type AMQP struct { type AMQP struct {
URL string `toml:"url" deprecated:"1.7.0;use 'brokers' instead"` URL string `toml:"url" deprecated:"1.7.0;1.35.0;use 'brokers' instead"`
Brokers []string `toml:"brokers"` Brokers []string `toml:"brokers"`
Exchange string `toml:"exchange"` Exchange string `toml:"exchange"`
ExchangeType string `toml:"exchange_type"` ExchangeType string `toml:"exchange_type"`
@ -56,9 +56,9 @@ type AMQP struct {
RoutingTag string `toml:"routing_tag"` RoutingTag string `toml:"routing_tag"`
RoutingKey string `toml:"routing_key"` RoutingKey string `toml:"routing_key"`
DeliveryMode string `toml:"delivery_mode"` DeliveryMode string `toml:"delivery_mode"`
Database string `toml:"database" deprecated:"1.7.0;use 'headers' instead"` Database string `toml:"database" deprecated:"1.7.0;1.35.0;use 'headers' instead"`
RetentionPolicy string `toml:"retention_policy" deprecated:"1.7.0;use 'headers' instead"` RetentionPolicy string `toml:"retention_policy" deprecated:"1.7.0;1.35.0;use 'headers' instead"`
Precision string `toml:"precision" deprecated:"1.2.0;option is ignored"` Precision string `toml:"precision" deprecated:"1.2.0;1.35.0;option is ignored"`
Headers map[string]string `toml:"headers"` Headers map[string]string `toml:"headers"`
Timeout config.Duration `toml:"timeout"` Timeout config.Duration `toml:"timeout"`
UseBatchFormat bool `toml:"use_batch_format"` UseBatchFormat bool `toml:"use_batch_format"`

2
plugins/outputs/influxdb/influxdb.go
View File

@ -59,7 +59,7 @@ type InfluxDB struct {
SkipDatabaseCreation bool `toml:"skip_database_creation"` SkipDatabaseCreation bool `toml:"skip_database_creation"`
InfluxUintSupport bool `toml:"influx_uint_support"` InfluxUintSupport bool `toml:"influx_uint_support"`
OmitTimestamp bool `toml:"influx_omit_timestamp"` OmitTimestamp bool `toml:"influx_omit_timestamp"`
Precision string `toml:"precision" deprecated:"1.0.0;option is ignored"` Precision string `toml:"precision" deprecated:"1.0.0;1.35.0;option is ignored"`
Log telegraf.Logger `toml:"-"` Log telegraf.Logger `toml:"-"`
tls.ClientConfig tls.ClientConfig

4
plugins/outputs/kinesis/kinesis.go
View File

@ -26,8 +26,8 @@ const maxRecordsPerRequest uint32 = 500
type ( type (
KinesisOutput struct { KinesisOutput struct {
StreamName string `toml:"streamname"` StreamName string `toml:"streamname"`
PartitionKey string `toml:"partitionkey" deprecated:"1.5.0;use 'partition.key' instead"` PartitionKey string `toml:"partitionkey" deprecated:"1.5.0;1.35.0;use 'partition.key' instead"`
RandomPartitionKey bool `toml:"use_random_partitionkey" deprecated:"1.5.0;use 'partition.method' instead"` RandomPartitionKey bool `toml:"use_random_partitionkey" deprecated:"1.5.0;1.35.0;use 'partition.method' instead"`
Partition *Partition `toml:"partition"` Partition *Partition `toml:"partition"`
Debug bool `toml:"debug"` Debug bool `toml:"debug"`

2
plugins/outputs/librato/librato.go
View File

@ -26,7 +26,7 @@ type Librato struct {
APIUser config.Secret `toml:"api_user"` APIUser config.Secret `toml:"api_user"`
APIToken config.Secret `toml:"api_token"` APIToken config.Secret `toml:"api_token"`
Debug bool `toml:"debug"` Debug bool `toml:"debug"`
SourceTag string `toml:"source_tag" deprecated:"1.0.0;use 'template' instead"` SourceTag string `toml:"source_tag" deprecated:"1.0.0;1.35.0;use 'template' instead"`
Timeout config.Duration `toml:"timeout"` Timeout config.Duration `toml:"timeout"`
Template string `toml:"template"` Template string `toml:"template"`
Log telegraf.Logger `toml:"-"` Log telegraf.Logger `toml:"-"`

4
plugins/outputs/mqtt/mqtt.go
View File

@ -26,9 +26,9 @@ type message struct {
} }
type MQTT struct { type MQTT struct {
TopicPrefix string `toml:"topic_prefix" deprecated:"1.25.0;use 'topic' instead"` TopicPrefix string `toml:"topic_prefix" deprecated:"1.25.0;1.35.0;use 'topic' instead"`
Topic string `toml:"topic"` Topic string `toml:"topic"`
BatchMessage bool `toml:"batch" deprecated:"1.25.2;use 'layout = \"batch\"' instead"` BatchMessage bool `toml:"batch" deprecated:"1.25.2;1.35.0;use 'layout = \"batch\"' instead"`
Layout string `toml:"layout"` Layout string `toml:"layout"`
HomieDeviceName string `toml:"homie_device_name"` HomieDeviceName string `toml:"homie_device_name"`
HomieNodeID string `toml:"homie_node_id"` HomieNodeID string `toml:"homie_node_id"`

6
plugins/outputs/wavefront/wavefront.go
View File

@ -37,8 +37,8 @@ type Wavefront struct {
CSPBaseURL string `toml:"auth_csp_base_url"` CSPBaseURL string `toml:"auth_csp_base_url"`
AuthCSPAPIToken config.Secret `toml:"auth_csp_api_token"` AuthCSPAPIToken config.Secret `toml:"auth_csp_api_token"`
AuthCSPClientCredentials *authCSPClientCredentials `toml:"auth_csp_client_credentials"` AuthCSPClientCredentials *authCSPClientCredentials `toml:"auth_csp_client_credentials"`
Host string `toml:"host" deprecated:"2.4.0;use url instead"` Host string `toml:"host" deprecated:"1.28.0;1.35.0;use url instead"`
Port int `toml:"port" deprecated:"2.4.0;use url instead"` Port int `toml:"port" deprecated:"1.28.0;1.35.0;use url instead"`
Prefix string `toml:"prefix"` Prefix string `toml:"prefix"`
SimpleFields bool `toml:"simple_fields"` SimpleFields bool `toml:"simple_fields"`
MetricSeparator string `toml:"metric_separator"` MetricSeparator string `toml:"metric_separator"`
@ -51,7 +51,7 @@ type Wavefront struct {
ImmediateFlush bool `toml:"immediate_flush"` ImmediateFlush bool `toml:"immediate_flush"`
SendInternalMetrics bool `toml:"send_internal_metrics"` SendInternalMetrics bool `toml:"send_internal_metrics"`
SourceOverride []string `toml:"source_override"` SourceOverride []string `toml:"source_override"`
StringToNumber map[string][]map[string]float64 `toml:"string_to_number" deprecated:"1.9.0;use the enum processor instead"` StringToNumber map[string][]map[string]float64 `toml:"string_to_number" deprecated:"1.9.0;1.35.0;use the enum processor instead"`
httpconfig.HTTPClientConfig httpconfig.HTTPClientConfig

4
plugins/parsers/binary/parser.go
View File

@ -16,10 +16,10 @@ import (
type Parser struct { type Parser struct {
AllowNoMatch bool `toml:"allow_no_match"` AllowNoMatch bool `toml:"allow_no_match"`
Endianess string `toml:"endianess" deprecated:"1.27.4;use 'endianness' instead"` Endianess string `toml:"endianess" deprecated:"1.27.4;1.35.0;use 'endianness' instead"`
Endianness string `toml:"endianness"` Endianness string `toml:"endianness"`
Configs []Config `toml:"binary"` Configs []Config `toml:"binary"`
HexEncoding bool `toml:"hex_encoding" deprecated:"1.30.0;use 'binary_encoding' instead"` HexEncoding bool `toml:"hex_encoding" deprecated:"1.30.0;1.35.0;use 'binary_encoding' instead"`
Encoding string `toml:"binary_encoding"` Encoding string `toml:"binary_encoding"`
Log telegraf.Logger `toml:"-"` Log telegraf.Logger `toml:"-"`

16
plugins/parsers/xpath/parser.go
View File

@ -50,10 +50,10 @@ type Parser struct {
Log telegraf.Logger `toml:"-"` Log telegraf.Logger `toml:"-"`
// Required for backward compatibility // Required for backward compatibility
ConfigsXML []Config `toml:"xml" deprecated:"1.23.1;use 'xpath' instead"` ConfigsXML []Config `toml:"xml" deprecated:"1.23.1;1.35.0;use 'xpath' instead"`
ConfigsJSON []Config `toml:"xpath_json" deprecated:"1.23.1;use 'xpath' instead"` ConfigsJSON []Config `toml:"xpath_json" deprecated:"1.23.1;1.35.0;use 'xpath' instead"`
ConfigsMsgPack []Config `toml:"xpath_msgpack" deprecated:"1.23.1;use 'xpath' instead"` ConfigsMsgPack []Config `toml:"xpath_msgpack" deprecated:"1.23.1;1.35.0;use 'xpath' instead"`
ConfigsProto []Config `toml:"xpath_protobuf" deprecated:"1.23.1;use 'xpath' instead"` ConfigsProto []Config `toml:"xpath_protobuf" deprecated:"1.23.1;1.35.0;use 'xpath' instead"`
document dataDocument document dataDocument
} }
@ -95,7 +95,7 @@ func (p *Parser) Init() error {
p.Configs = append(p.Configs, p.ConfigsXML...) p.Configs = append(p.Configs, p.ConfigsXML...)
config.PrintOptionDeprecationNotice("parsers.xpath", "xml", telegraf.DeprecationInfo{ config.PrintOptionDeprecationNotice("parsers.xpath", "xml", telegraf.DeprecationInfo{
Since: "1.23.1", Since: "1.23.1",
RemovalIn: "2.0.0", RemovalIn: "1.35.0",
Notice: "use 'xpath' instead", Notice: "use 'xpath' instead",
}) })
} }
@ -109,7 +109,7 @@ func (p *Parser) Init() error {
p.Configs = append(p.Configs, p.ConfigsJSON...) p.Configs = append(p.Configs, p.ConfigsJSON...)
config.PrintOptionDeprecationNotice("parsers.xpath", "xpath_json", telegraf.DeprecationInfo{ config.PrintOptionDeprecationNotice("parsers.xpath", "xpath_json", telegraf.DeprecationInfo{
Since: "1.23.1", Since: "1.23.1",
RemovalIn: "2.0.0", RemovalIn: "1.35.0",
Notice: "use 'xpath' instead", Notice: "use 'xpath' instead",
}) })
} }
@ -121,7 +121,7 @@ func (p *Parser) Init() error {
p.Configs = append(p.Configs, p.ConfigsMsgPack...) p.Configs = append(p.Configs, p.ConfigsMsgPack...)
config.PrintOptionDeprecationNotice("parsers.xpath", "xpath_msgpack", telegraf.DeprecationInfo{ config.PrintOptionDeprecationNotice("parsers.xpath", "xpath_msgpack", telegraf.DeprecationInfo{
Since: "1.23.1", Since: "1.23.1",
RemovalIn: "2.0.0", RemovalIn: "1.35.0",
Notice: "use 'xpath' instead", Notice: "use 'xpath' instead",
}) })
} }
@ -143,7 +143,7 @@ func (p *Parser) Init() error {
p.Configs = append(p.Configs, p.ConfigsProto...) p.Configs = append(p.Configs, p.ConfigsProto...)
config.PrintOptionDeprecationNotice("parsers.xpath", "xpath_proto", telegraf.DeprecationInfo{ config.PrintOptionDeprecationNotice("parsers.xpath", "xpath_proto", telegraf.DeprecationInfo{
Since: "1.23.1", Since: "1.23.1",
RemovalIn: "2.0.0", RemovalIn: "1.35.0",
Notice: "use 'xpath' instead", Notice: "use 'xpath' instead",
}) })
} }