Collector refactoring

agent.go

@@ -11,28 +11,21 @@ import (
 	"github.com/amonapp/amonagent/plugins"
 )
 
-// ConfiguredPlugin - XXX
-type ConfiguredPlugin struct {
-	Name   string
-	Plugin plugins.Plugin
-}
-
 // Agent - XXX
 type Agent struct {
 	// Interval at which to gather information
 	Interval time.Duration
 
-	ConfiguredPlugins []ConfiguredPlugin
+	ConfiguredPlugins []plugins.ConfiguredPlugin
 }
 
 // Test - XXX
 func (a *Agent) Test(config settings.Struct) error {
 
-	allMetrics := collectors.CollectAllData()
+	allMetrics := collectors.CollectAllData(a.ConfiguredPlugins)
 
 	ProcessesData := collectors.CollectProcessData()
 	SystemData := collectors.CollectSystemData()
-	EnabledPlugins, _ := plugins.GetAllEnabledPlugins()
 	HostData := collectors.CollectHostData()
 
 	fmt.Println("\n------------------")
@@ -51,12 +44,9 @@ func (a *Agent) Test(config settings.Struct) error {
 	fmt.Println("\033[92mPlugins: \033[0m")
 	fmt.Println("")
 
-	for _, p := range EnabledPlugins {
-
-		creator, _ := plugins.Plugins[p.Name]
-		plugin := creator()
+	for _, p := range a.ConfiguredPlugins {
 		start := time.Now()
-		PluginResult, err := plugin.Collect()
+		PluginResult, err := p.Plugin.Collect()
 		if err != nil {
 			log.Errorf("Can't get stats for plugin: %s", err)
 		}
@@ -95,8 +85,6 @@ func (a *Agent) Test(config settings.Struct) error {
 
 	fmt.Println("\n------------------")
 
-	// url := remote.SystemURL()
-
 	err := remote.SendData(allMetrics, true)
 	if err != nil {
 		return fmt.Errorf("%s\n", err.Error())
@@ -107,7 +95,9 @@ func (a *Agent) Test(config settings.Struct) error {
 
 // GatherAndSend - XXX
 func (a *Agent) GatherAndSend(debug bool) error {
-	allMetrics := collectors.CollectAllData()
+
+	allMetrics := collectors.CollectAllData(a.ConfiguredPlugins)
+
 	log.Infof("Metrics collected (Interval:%s)\n", a.Interval)
 
 	err := remote.SendData(allMetrics, debug)
@@ -121,14 +111,14 @@ func (a *Agent) GatherAndSend(debug bool) error {
 // NewAgent - XXX
 func NewAgent(config settings.Struct) (*Agent, error) {
 
-	var configuredPlugins = []ConfiguredPlugin{}
+	var configuredPlugins = []plugins.ConfiguredPlugin{}
 
 	EnabledPlugins, _ := plugins.GetAllEnabledPlugins()
 	for _, p := range EnabledPlugins {
 		creator, _ := plugins.Plugins[p.Name]
 		plugin := creator()
 
-		t := ConfiguredPlugin{Name: p.Name, Plugin: plugin}
+		t := plugins.ConfiguredPlugin{Name: p.Name, Plugin: plugin}
 		configuredPlugins = append(configuredPlugins, t)
 
 	}

collectors/all.go

@@ -61,22 +61,18 @@ type PluginResultStruct struct {
 }
 
 // CollectPluginsData - XXX
-func CollectPluginsData() (interface{}, interface{}) {
+func CollectPluginsData(configuredPlugins []plugins.ConfiguredPlugin) (interface{}, interface{}) {
 	PluginResults := make(map[string]interface{})
 	var CheckResults interface{}
 	var wg sync.WaitGroup
-	EnabledPlugins, _ := plugins.GetAllEnabledPlugins()
 
-	resultChan := make(chan PluginResultStruct, len(EnabledPlugins))
+	resultChan := make(chan PluginResultStruct, len(configuredPlugins))
 
-	for _, p := range EnabledPlugins {
+	for _, p := range configuredPlugins {
 		wg.Add(1)
 
-		creator, _ := plugins.Plugins[p.Name]
-		plugin := creator()
-
-		go func(p plugins.PluginConfig) {
-			PluginResult, err := plugin.Collect()
+		go func(p plugins.ConfiguredPlugin) {
+			PluginResult, err := p.Plugin.Collect()
 			if err != nil {
 				log.Errorf("Can't get stats for plugin: %s", err)
 			}
@@ -206,11 +202,11 @@ func CollectProcessData() ProcessesList {
 }
 
 // CollectAllData - XXX
-func CollectAllData() AllMetricsStruct {
+func CollectAllData(configuredPlugins []plugins.ConfiguredPlugin) AllMetricsStruct {
 
 	ProcessesData := CollectProcessData()
 	SystemData := CollectSystemData()
-	Plugins, Checks := CollectPluginsData()
+	Plugins, Checks := CollectPluginsData(configuredPlugins)
 	HostData := CollectHostData()
 
 	allMetrics := AllMetricsStruct{

plugins/registry.go

@@ -13,6 +13,12 @@ import (
 	"github.com/amonapp/amonagent/internal/settings"
 )
 
+// ConfiguredPlugin - XXX
+type ConfiguredPlugin struct {
+	Name   string
+	Plugin Plugin
+}
+
 // PluginConfig - XXX
 type PluginConfig struct {
 	Path string