chore: update removal and deprecations for v1.30.0 (#13351)

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-

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",
+		Since:     "1.7.0",
-		Notice: "use 'inputs.jolokia2' with the 'cassandra.conf' example configuration instead",
+		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",
+		Since:     "1.6.0",
-		Notice: "use 'inputs.http' instead",
+		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",
+		Since:     "1.5.0",
-		Notice: "use 'inputs.jolokia2' instead",
+		RemovalIn: "1.30.0",
+		Notice:    "use 'inputs.jolokia2' instead",
 	},
 	"kafka_consumer_legacy": {
-		Since:  "1.4.0",
+		Since:     "1.4.0",
-		Notice: "use 'inputs.kafka_consumer' instead, NOTE: 'kafka_consumer' only supports Kafka v0.8+",
+		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",
+		Since:     "1.0.0",
-		Notice: "use 'inputs.snmp' instead",
+		RemovalIn: "1.30.0",
+		Notice:    "use 'inputs.snmp' instead",
 	},
 	"tcp_listener": {
-		Since:  "1.3.0",
+		Since:     "1.3.0",
-		Notice: "use 'inputs.socket_listener' instead",
+		RemovalIn: "1.30.0",
+		Notice:    "use 'inputs.socket_listener' instead",
 	},
 	"udp_listener": {
-		Since:  "1.3.0",
+		Since:     "1.3.0",
-		Notice: "use 'inputs.socket_listener' instead",
+		RemovalIn: "1.30.0",
+		Notice:    "use 'inputs.socket_listener' instead",
 	},
 }

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"`

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}
 	}

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"`
 

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

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"`
 

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",
+		Since:     "1.3.0",
-		Notice: "use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878)",
+		RemovalIn: "1.30.0",
+		Notice:    "use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878)",
 	},
 }

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"`