Merge pull request #8 from newrelic/extra-attributes-agent

Extra attributes agent

Author: Camden Cheek

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.1.1 - 2018-11-15
+### Added
+- Datacenter and IP attributes to all Agent samples
+
 ## 0.1.0 - 2018-11-14
 ### Added
 - Initial version: Includes Metrics and Inventory data

src/agent/agent.go

@@ -21,8 +21,10 @@ const workerCount = 5
 // It's comprised of the client connected to that agent
 // and the Entity representing it.
 type Agent struct {
-	entity *integration.Entity
-	Client *api.Client
+	entity     *integration.Entity
+	Client     *api.Client
+	datacenter string
+	ipAddr     string
 }
 
 // CreateAgents creates an Agent structure for every Agent member of the LAN cluster
@@ -54,7 +56,7 @@ func CreateAgents(client *api.Client, i *integration.Integration, args *args.Arg
 			continue
 		}
 
-		agent := NewAgent(client, entity)
+		agent := NewAgent(client, entity, member.Addr, member.Tags["dc"])
 		agents = append(agents, agent)
 
 		// we need to identify the leader to collect catalog
@@ -69,10 +71,12 @@ func CreateAgents(client *api.Client, i *integration.Integration, args *args.Arg
 }
 
 // NewAgent creates a new agent from the given client and Entity
-func NewAgent(client *api.Client, entity *integration.Entity) *Agent {
+func NewAgent(client *api.Client, entity *integration.Entity, ipAddr, datacenter string) *Agent {
 	return &Agent{
-		Client: client,
-		entity: entity,
+		Client:     client,
+		entity:     entity,
+		ipAddr:     ipAddr,
+		datacenter: datacenter,
 	}
 }
 

src/agent/metric_collection.go

@@ -43,6 +43,8 @@ func metricWorker(agentChan <-chan *Agent, wg *sync.WaitGroup) {
 		metricSet := agent.entity.NewMetricSet("ConsulAgentSample",
 			metric.Attribute{Key: "displayName", Value: agent.entity.Metadata.Name},
 			metric.Attribute{Key: "entityName", Value: agent.entity.Metadata.Namespace + ":" + agent.entity.Metadata.Name},
+			metric.Attribute{Key: "ip", Value: agent.ipAddr},
+			metric.Attribute{Key: "datacenter", Value: agent.datacenter},
 		)
 
 		// Collect core metrics

src/agent/metric_collection_test.go

@@ -38,8 +38,10 @@ func TestCollectMetrics_CoreMetrics(t *testing.T) {
 	}
 
 	agent := &Agent{
-		Client: client,
-		entity: entity,
+		Client:     client,
+		entity:     entity,
+		datacenter: "MyDC",
+		ipAddr:     "192.168.0.0",
 	}
 
 	agents := []*Agent{agent}
@@ -118,6 +120,8 @@ func TestCollectMetrics_CoreMetrics(t *testing.T) {
 		"event_type":                         "ConsulAgentSample",
 		"displayName":                        agent.entity.Metadata.Name,
 		"entityName":                         agent.entity.Metadata.Namespace + ":" + agent.entity.Metadata.Name,
+		"datacenter":                         agent.datacenter,
+		"ip":                                 agent.ipAddr,
 		"runtime.goroutines":                 float64(49),
 		"runtime.heapObjects":                float64(33463),
 		"runtime.virtualAddressSpaceInBytes": float64(14395640),
@@ -165,8 +169,10 @@ func TestCollectMetrics_PeerMetrics(t *testing.T) {
 	}
 
 	agent := &Agent{
-		Client: client,
-		entity: entity,
+		Client:     client,
+		entity:     entity,
+		datacenter: "MyDC",
+		ipAddr:     "192.168.0.0",
 	}
 
 	agents := []*Agent{agent}
@@ -183,6 +189,8 @@ func TestCollectMetrics_PeerMetrics(t *testing.T) {
 		"event_type":  "ConsulAgentSample",
 		"displayName": agent.entity.Metadata.Name,
 		"entityName":  agent.entity.Metadata.Namespace + ":" + agent.entity.Metadata.Name,
+		"datacenter":  agent.datacenter,
+		"ip":          agent.ipAddr,
 		"agent.peers": float64(3),
 	}
 
@@ -220,8 +228,10 @@ func TestCollectMetrics_LatencyMetrics(t *testing.T) {
 	}
 
 	agent := &Agent{
-		Client: client,
-		entity: entity,
+		Client:     client,
+		entity:     entity,
+		datacenter: "MyDC",
+		ipAddr:     "192.168.0.0",
 	}
 
 	agents := []*Agent{agent}
@@ -288,9 +298,11 @@ func TestCollectMetrics_LatencyMetrics(t *testing.T) {
 	})
 
 	expected := map[string]interface{}{
-		"displayName":                           "consul-0",
-		"entityName":                            "agent:consul-0",
-		"event_type":                            "ConsulAgentSample",
+		"displayName": "consul-0",
+		"entityName":  "agent:consul-0",
+		"event_type":  "ConsulAgentSample",
+		"datacenter":  agent.datacenter,
+		"ip":          agent.ipAddr,
 		"net.agent.medianLatencyInMilliseconds": 0.3303747050428994,
 		"net.agent.minLatencyInMilliseconds":    0.28994299609053836,
 		"net.agent.maxLatencyInMilliseconds":    0.453482732462,

src/consul.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	integrationName    = "com.newrelic.consul"
-	integrationVersion = "0.1.0"
+	integrationVersion = "0.1.1"
 )
 
 func main() {

src/datacenter/datacenter_test.go

@@ -213,7 +213,7 @@ func Test_Datacenter_CollectMetrics_Full(t *testing.T) {
 
 	c := &Datacenter{
 		entity: dcEntity,
-		leader: agent.NewAgent(client, agentEntity),
+		leader: agent.NewAgent(client, agentEntity, "", ""),
 	}
 
 	setMetricMuxes(mux)
@@ -274,7 +274,7 @@ func Test_Datacenter_CollectMetrics_All_Endpoint_Fails(t *testing.T) {
 
 	c := &Datacenter{
 		entity: dcEntity,
-		leader: agent.NewAgent(client, agentEntity),
+		leader: agent.NewAgent(client, agentEntity, "", ""),
 	}
 
 	expected := map[string]interface{}{