Enable plugin filtering for deprecation list.

influxdata · Oct 14, 2021 · 4316f39 · 4316f39
1 parent 9043900
commit 4316f39
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
@@ -411,7 +411,12 @@ func main() {
 	case *fDeprecationList:
 		c := config.NewConfig()
 		c.VersionMajor, c.VersionMinor = config.ParseVersion(version)
-		infos := c.CollectDeprecationInfos()
+		infos := c.CollectDeprecationInfos(
+			inputFilters,
+			outputFilters,
+			aggregatorFilters,
+			processorFilters,
+		)
 		//nolint:revive // We will notice if Println fails
 		fmt.Println("Deprecated Input Plugins: ")
 		c.PrintDeprecationList(infos["inputs"])

diff --git a/config/deprecation.go b/config/deprecation.go
@@ -165,11 +165,15 @@ func (c *Config) printUserDeprecation(category, name string, plugin interface{})
 	return nil
 }
 
-func (c *Config) CollectDeprecationInfos() map[string][]PluginDeprecationInfo {
+func (c *Config) CollectDeprecationInfos(inFilter, outFilter, aggFilter, procFilter []string) map[string][]PluginDeprecationInfo {
 	infos := make(map[string][]PluginDeprecationInfo)
 
 	infos["inputs"] = make([]PluginDeprecationInfo, 0)
 	for name, creator := range inputs.Inputs {
+		if len(inFilter) > 0 && !sliceContains(name, inFilter) {
+			continue
+		}
+
 		plugin := creator()
 		info := c.collectDeprecationInfo("inputs", name, plugin, true)
 
@@ -180,6 +184,10 @@ func (c *Config) CollectDeprecationInfos() map[string][]PluginDeprecationInfo {
 
 	infos["outputs"] = make([]PluginDeprecationInfo, 0)
 	for name, creator := range outputs.Outputs {
+		if len(outFilter) > 0 && !sliceContains(name, outFilter) {
+			continue
+		}
+
 		plugin := creator()
 		info := c.collectDeprecationInfo("outputs", name, plugin, true)
 
@@ -190,6 +198,10 @@ func (c *Config) CollectDeprecationInfos() map[string][]PluginDeprecationInfo {
 
 	infos["processors"] = make([]PluginDeprecationInfo, 0)
 	for name, creator := range processors.Processors {
+		if len(procFilter) > 0 && !sliceContains(name, procFilter) {
+			continue
+		}
+
 		plugin := creator()
 		info := c.collectDeprecationInfo("processors", name, plugin, true)
 
@@ -200,6 +212,10 @@ func (c *Config) CollectDeprecationInfos() map[string][]PluginDeprecationInfo {
 
 	infos["aggregators"] = make([]PluginDeprecationInfo, 0)
 	for name, creator := range aggregators.Aggregators {
+		if len(aggFilter) > 0 && !sliceContains(name, aggFilter) {
+			continue
+		}
+
 		plugin := creator()
 		info := c.collectDeprecationInfo("aggregators", name, plugin, true)