From ca7c8f7005d2ba126aad1c0fe658f7210ececeec Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Fri, 2 Jun 2023 04:36:19 -0600 Subject: [PATCH] chore: update removal and deprecations for v1.30.0 (#13351) --- config/config.go | 2 +- plugins/inputs/deprecations.go | 37 +++++++++++-------- plugins/inputs/disk/disk.go | 2 +- plugins/inputs/icinga2/icinga2.go | 1 - plugins/inputs/mqtt_consumer/mqtt_consumer.go | 2 +- plugins/inputs/nats_consumer/nats_consumer.go | 2 +- plugins/inputs/statsd/statsd.go | 2 +- plugins/outputs/deprecations.go | 5 ++- plugins/outputs/influxdb/influxdb.go | 2 +- 9 files changed, 31 insertions(+), 24 deletions(-) diff --git a/config/config.go b/config/config.go index ab00d32f3..04c187e19 100644 --- a/config/config.go +++ b/config/config.go @@ -203,7 +203,7 @@ type AgentConfig struct { // FlushBufferWhenFull tells Telegraf to flush the metric buffer whenever // it fills up, regardless of FlushInterval. Setting this option to true // does _not_ deactivate FlushInterval. - FlushBufferWhenFull bool `toml:"flush_buffer_when_full" deprecated:"0.13.0;2.0.0;option is ignored"` + FlushBufferWhenFull bool `toml:"flush_buffer_when_full" deprecated:"0.13.0;1.30.0;option is ignored"` // TODO(cam): Remove UTC and parameter, they are no longer // valid for the agent config. Leaving them here for now for backwards- diff --git a/plugins/inputs/deprecations.go b/plugins/inputs/deprecations.go index 9c9a05634..d43348ea4 100644 --- a/plugins/inputs/deprecations.go +++ b/plugins/inputs/deprecations.go @@ -5,8 +5,9 @@ import "github.com/influxdata/telegraf" // Deprecations lists the deprecated plugins var Deprecations = map[string]telegraf.DeprecationInfo{ "cassandra": { - Since: "1.7.0", - Notice: "use 'inputs.jolokia2' with the 'cassandra.conf' example configuration instead", + Since: "1.7.0", + RemovalIn: "1.30.0", + Notice: "use 'inputs.jolokia2' with the 'cassandra.conf' example configuration instead", }, "cisco_telemetry_gnmi": { Since: "1.15.0", @@ -17,21 +18,24 @@ var Deprecations = map[string]telegraf.DeprecationInfo{ Notice: "has been renamed to 'influxdb_listener', use 'inputs.influxdb_listener' or 'inputs.http_listener_v2' instead", }, "httpjson": { - Since: "1.6.0", - Notice: "use 'inputs.http' instead", + Since: "1.6.0", + RemovalIn: "1.30.0", + Notice: "use 'inputs.http' instead", }, "io": { Since: "0.10.0", - RemovalIn: "2.0.0", + RemovalIn: "1.30.0", Notice: "use 'inputs.diskio' instead", }, "jolokia": { - Since: "1.5.0", - Notice: "use 'inputs.jolokia2' instead", + Since: "1.5.0", + RemovalIn: "1.30.0", + Notice: "use 'inputs.jolokia2' instead", }, "kafka_consumer_legacy": { - Since: "1.4.0", - Notice: "use 'inputs.kafka_consumer' instead, NOTE: 'kafka_consumer' only supports Kafka v0.8+", + Since: "1.4.0", + RemovalIn: "1.30.0", + Notice: "use 'inputs.kafka_consumer' instead, NOTE: 'kafka_consumer' only supports Kafka v0.8+", }, "KNXListener": { Since: "1.20.1", @@ -42,15 +46,18 @@ var Deprecations = map[string]telegraf.DeprecationInfo{ Notice: "use 'inputs.tail' with 'grok' data format instead", }, "snmp_legacy": { - Since: "1.0.0", - Notice: "use 'inputs.snmp' instead", + Since: "1.0.0", + RemovalIn: "1.30.0", + Notice: "use 'inputs.snmp' instead", }, "tcp_listener": { - Since: "1.3.0", - Notice: "use 'inputs.socket_listener' instead", + Since: "1.3.0", + RemovalIn: "1.30.0", + Notice: "use 'inputs.socket_listener' instead", }, "udp_listener": { - Since: "1.3.0", - Notice: "use 'inputs.socket_listener' instead", + Since: "1.3.0", + RemovalIn: "1.30.0", + Notice: "use 'inputs.socket_listener' instead", }, } diff --git a/plugins/inputs/disk/disk.go b/plugins/inputs/disk/disk.go index f9f33433a..81251d3f3 100644 --- a/plugins/inputs/disk/disk.go +++ b/plugins/inputs/disk/disk.go @@ -18,7 +18,7 @@ var sampleConfig string type DiskStats struct { ps system.PS - LegacyMountPoints []string `toml:"mountpoints" deprecated:"0.10.2;2.0.0;use 'mount_points' instead"` + LegacyMountPoints []string `toml:"mountpoints" deprecated:"0.10.2;1.30.0;use 'mount_points' instead"` MountPoints []string `toml:"mount_points"` IgnoreFS []string `toml:"ignore_fs"` diff --git a/plugins/inputs/icinga2/icinga2.go b/plugins/inputs/icinga2/icinga2.go index 91bb93bfe..3043bb9d8 100644 --- a/plugins/inputs/icinga2/icinga2.go +++ b/plugins/inputs/icinga2/icinga2.go @@ -90,7 +90,6 @@ func (i *Icinga2) Init() error { i.client = client // For backward config compatibility - // should be removed in 2.0.0 if i.ObjectType != "" { i.Objects = []string{i.ObjectType} } diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go index 5b4b1ea3c..9543ee995 100644 --- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go +++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go @@ -71,7 +71,7 @@ type MQTTConsumer struct { MaxUndeliveredMessages int `toml:"max_undelivered_messages"` parser telegraf.Parser - MetricBuffer int `toml:"metric_buffer" deprecated:"0.10.3;2.0.0;option is ignored"` + MetricBuffer int `toml:"metric_buffer" deprecated:"0.10.3;1.30.0;option is ignored"` PersistentSession bool ClientID string `toml:"client_id"` diff --git a/plugins/inputs/nats_consumer/nats_consumer.go b/plugins/inputs/nats_consumer/nats_consumer.go index 44a1876cf..1811b224e 100644 --- a/plugins/inputs/nats_consumer/nats_consumer.go +++ b/plugins/inputs/nats_consumer/nats_consumer.go @@ -55,7 +55,7 @@ type natsConsumer struct { PendingBytesLimit int `toml:"pending_bytes_limit"` MaxUndeliveredMessages int `toml:"max_undelivered_messages"` - MetricBuffer int `toml:"metric_buffer" deprecated:"0.10.3;2.0.0;option is ignored"` + MetricBuffer int `toml:"metric_buffer" deprecated:"0.10.3;1.30.0;option is ignored"` conn *nats.Conn jsConn nats.JetStreamContext diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go index 7d2817c44..3aec29b52 100644 --- a/plugins/inputs/statsd/statsd.go +++ b/plugins/inputs/statsd/statsd.go @@ -75,7 +75,7 @@ type Statsd struct { DeleteCounters bool `toml:"delete_counters"` DeleteSets bool `toml:"delete_sets"` DeleteTimings bool `toml:"delete_timings"` - ConvertNames bool `toml:"convert_names" deprecated:"0.12.0;2.0.0;use 'metric_separator' instead"` + ConvertNames bool `toml:"convert_names" deprecated:"0.12.0;1.30.0;use 'metric_separator' instead"` EnableAggregationTemporality bool `toml:"enable_aggregation_temporality"` diff --git a/plugins/outputs/deprecations.go b/plugins/outputs/deprecations.go index 6c318cdf6..931fb0250 100644 --- a/plugins/outputs/deprecations.go +++ b/plugins/outputs/deprecations.go @@ -5,7 +5,8 @@ import "github.com/influxdata/telegraf" // Deprecations lists the deprecated plugins var Deprecations = map[string]telegraf.DeprecationInfo{ "riemann_legacy": { - Since: "1.3.0", - Notice: "use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878)", + Since: "1.3.0", + RemovalIn: "1.30.0", + Notice: "use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878)", }, } diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go index 6b2e5d0ba..eb71c651f 100644 --- a/plugins/outputs/influxdb/influxdb.go +++ b/plugins/outputs/influxdb/influxdb.go @@ -36,7 +36,7 @@ type Client interface { // InfluxDB struct is the primary data structure for the plugin type InfluxDB struct { - URL string `toml:"url" deprecated:"0.1.9;2.0.0;use 'urls' instead"` + URL string `toml:"url" deprecated:"0.1.9;1.30.0;use 'urls' instead"` URLs []string `toml:"urls"` Username config.Secret `toml:"username"` Password config.Secret `toml:"password"`