diff --git a/plugins/inputs/deprecations.go b/plugins/inputs/deprecations.go
index edec5fcf13ac1..3aaddc7f9ef31 100644
--- a/plugins/inputs/deprecations.go
+++ b/plugins/inputs/deprecations.go
@@ -3,13 +3,40 @@ package inputs
 import "github.com/influxdata/telegraf"
 
 var Deprecations = map[string]telegraf.DeprecationInfo{
-	"cassandra":             {"1.7", "", "use 'inputs.jolokia2' with the 'cassandra.conf' example configuration instead"},
-	"http_listener_v2":      {"1.9", "", "has been renamed to 'influxdb_listener', use 'inputs.influxdb_listener' or 'inputs.influxdb_listener_v2' instead"},
-	"httpjson":              {"1.6", "", "use 'inputs.http' instead"},
-	"jolokia":               {"1.5", "", "use 'inputs.jolokia2' instead"},
-	"kafka_consumer_legacy": {"1.20", "", "use 'inputs.kafka_consumer' instead, NOTE: 'kafka_consumer' only supports Kafka v0.8+"},
-	"logparser":             {"1.15", "", "use 'inputs.tail' with 'grok' data format instead"},
-	"snmp_legacy":           {"1.20", "", "use 'inputs.snmp' instead"},
-	"tcp_listener":          {"1.3", "", "use 'inputs.socket_listener' instead"},
-	"udp_listener":          {"1.3", "", "use 'inputs.socket_listener' instead"},
+	"cassandra": {
+		Since:  "1.7",
+		Notice: "use 'inputs.jolokia2' with the 'cassandra.conf' example configuration instead",
+	},
+	"http_listener_v2": {
+		Since:  "1.9",
+		Notice: "has been renamed to 'influxdb_listener', use 'inputs.influxdb_listener' or 'inputs.influxdb_listener_v2' instead",
+	},
+	"httpjson": {
+		Since:  "1.6",
+		Notice: "use 'inputs.http' instead",
+	},
+	"jolokia": {
+		Since:  "1.5",
+		Notice: "use 'inputs.jolokia2' instead",
+	},
+	"kafka_consumer_legacy": {
+		Since:  "1.20",
+		Notice: "use 'inputs.kafka_consumer' instead, NOTE: 'kafka_consumer' only supports Kafka v0.8+",
+	},
+	"logparser": {
+		Since:  "1.15",
+		Notice: "use 'inputs.tail' with 'grok' data format instead",
+	},
+	"snmp_legacy": {
+		Since:  "1.20",
+		Notice: "use 'inputs.snmp' instead",
+	},
+	"tcp_listener": {
+		Since:  "1.3",
+		Notice: "use 'inputs.socket_listener' instead",
+	},
+	"udp_listener": {
+		Since:  "1.3",
+		Notice: "use 'inputs.socket_listener' instead",
+	},
 }
diff --git a/plugins/outputs/deprecations.go b/plugins/outputs/deprecations.go
index 900e5ffd1e36b..de09f51fedabc 100644
--- a/plugins/outputs/deprecations.go
+++ b/plugins/outputs/deprecations.go
@@ -3,5 +3,8 @@ package outputs
 import "github.com/influxdata/telegraf"
 
 var Deprecations = map[string]telegraf.DeprecationInfo{
-	"riemann_legacy": {"1.20", "", "use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878)"},
+	"riemann_legacy": {
+		Since:  "1.20",
+		Notice: "use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878)",
+	},
 }