Add config and discovery tests

cmd/config_test.go

@@ -69,6 +69,9 @@ func (suite *AgentCmdTestSuite) SetupTest() {
 		},
 		FactsServiceURL: "amqp://guest:guest@serviceurl:5672",
 		PluginsFolder:   "/usr/etc/trento/plugins/",
+		PrometheusTargets: map[string]string{
+			"node_exporter": "10.0.0.5:9100",
+		},
 	}
 }
 
@@ -85,6 +88,7 @@ func (suite *AgentCmdTestSuite) TestConfigFromFlags() {
 		"--api-key=some-api-key",
 		"--force-agent-id=some-agent-id",
 		"--facts-service-url=amqp://guest:guest@serviceurl:5672",
+		"--node-exporter-target=10.0.0.5:9100",
 	})
 
 	_ = suite.cmd.Execute()
@@ -107,6 +111,7 @@ func (suite *AgentCmdTestSuite) TestConfigFromEnv() {
 	os.Setenv("TRENTO_API_KEY", "some-api-key")
 	os.Setenv("TRENTO_FORCE_AGENT_ID", "some-agent-id")
 	os.Setenv("TRENTO_FACTS_SERVICE_URL", "amqp://guest:guest@serviceurl:5672")
+	os.Setenv("TRENTO_NODE_EXPORTER_TARGET", "10.0.0.5:9100")
 
 	_ = suite.cmd.Execute()
 

internal/discovery/host.go

@@ -121,7 +121,15 @@ func getNetworksData() ([]string, []int, error) {
 }
 
 func updatePrometheusTargets(targets PrometheusTargets, ipAddresses []string) PrometheusTargets {
-	// Get lowest IP address value to replace empty exporter targets
+	// Return exporter details if they are given by the user
+	nodeExporterTarget, ok := targets[NodeExporterName]
+	if ok && nodeExporterTarget != "" {
+		return PrometheusTargets{
+			NodeExporterName: nodeExporterTarget,
+		}
+	}
+
+	// Fallback to lowest IP address value to replace empty exporter targets
 	ips := make([]net.IP, 0, len(ipAddresses))
 	for _, ip := range ipAddresses {
 		parsedIp := net.ParseIP(ip)
@@ -135,14 +143,8 @@ func updatePrometheusTargets(targets PrometheusTargets, ipAddresses []string) Pr
 		return bytes.Compare(ips[i], ips[j]) < 0
 	})
 
-	// Replace exporter values if they are not given by the user
-	nodeExporterTarget, ok := targets[NodeExporterName]
-	if !ok || nodeExporterTarget == "" {
-		nodeExporterTarget = fmt.Sprintf("%s:%d", ips[0], NodeExporterPort)
-	}
-
 	return PrometheusTargets{
-		NodeExporterName: nodeExporterTarget,
+		NodeExporterName: fmt.Sprintf("%s:%d", ips[0], NodeExporterPort),
 	}
 }
 

internal/discovery/host_internal_test.go

@@ -0,0 +1,42 @@
+package discovery
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+)
+
+type HostInternalTestSuite struct {
+	suite.Suite
+	ipAddresses []string
+}
+
+func TestHostInternalTestSuite(t *testing.T) {
+	suite.Run(t, new(HostInternalTestSuite))
+}
+
+func (suite *HostInternalTestSuite) SetupSuite() {
+	suite.ipAddresses = []string{"127.0.0.1", "::1", "10.1.1.5", "10.1.1.4", "10.1.1.6", "6c62:7cc9:3936:e802:2bbe"}
+}
+
+func (suite *HostInternalTestSuite) TestUpdatePrometheusTargets() {
+	initialTargets := PrometheusTargets{
+		"node_exporter": "",
+	}
+
+	expectedTargets := PrometheusTargets{
+		"node_exporter": "10.1.1.4:9100",
+	}
+
+	updatedTargets := updatePrometheusTargets(initialTargets, suite.ipAddresses)
+	suite.Equal(expectedTargets, updatedTargets)
+}
+
+func (suite *HostInternalTestSuite) TestUpdatePrometheusTargetsGivenByUser() {
+	initialTargets := PrometheusTargets{
+		"node_exporter": "192.168.1.60:9123",
+	}
+
+	updatedTargets := updatePrometheusTargets(initialTargets, suite.ipAddresses)
+	suite.Equal(initialTargets, updatedTargets)
+}

internal/discovery/mocks/discovered_host_mock.go

@@ -16,5 +16,8 @@ func NewDiscoveredHostMock() hosts.DiscoveredHost {
 		AgentVersion:             "trento-agent-version",
 		InstallationSource:       "Community",
 		FullyQualifiedDomainName: &fqdn,
+		PrometheusTargets: map[string]string{
+			"node_exporter": "10.1.1.4:9100",
+		},
 	}
 }

test/fixtures/config/agent.yaml

@@ -8,3 +8,4 @@ server-url: http://serverurl
 api-key: some-api-key
 force-agent-id: some-agent-id
 facts-service-url: amqp://guest:guest@serviceurl:5672
+node-exporter-target: 10.0.0.5:9100

test/fixtures/discovery/host/expected_published_host_discovery.json

@@ -19,6 +19,9 @@
     "total_memory_mb": 4096,
     "agent_version": "trento-agent-version",
     "installation_source": "Community",
-    "fully_qualified_domain_name": "com.example.trento.host"
+    "fully_qualified_domain_name": "com.example.trento.host",
+    "prometheus_targets": {
+      "node_exporter": "10.1.1.4:9100"
+    }
   }
 }