Revert much of the newer config file parsing, fix tagdrop/tagpass

2015-11-23 18:00:54 -07:00
parent 224a570a08
commit 8dde60e869
4 changed files with 169 additions and 294 deletions
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -102,7 +102,7 @@ func main() {
 		ag.Debug = true
 	}

-	outputs, err := ag.LoadOutputs(outputFilters, config)
+	outputs, err := ag.LoadOutputs(outputFilters)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -111,7 +111,7 @@ func main() {
 		os.Exit(1)
 	}

-	plugins, err := ag.LoadPlugins(pluginFilters, config)
+	plugins, err := ag.LoadPlugins(pluginFilters)
 	if err != nil {
 		log.Fatal(err)
 	}