Add node-id and node attributes to tags.

plugins/elasticsearch/elasticsearch.go

@@ -14,6 +14,7 @@ const indicesStatsPathLocal = "/_nodes/_local/stats/indices"
 type node struct {
 	Host       string                            `json:"host"`
 	Name       string                            `json:"name"`
+	Attributes map[string]string                 `json:"attributes"`
 	Indices    map[string]map[string]interface{} `json:"indices"`
 }
 
@@ -83,13 +84,18 @@ func (e *Elasticsearch) gatherUrl(url string, acc plugins.Accumulator) error {
 		return err
 	}
 
-	for _, n := range esRes.Nodes {
+	for id, n := range esRes.Nodes {
 		tags := map[string]string{
+			"node_id":      id,
 			"node_host":    n.Host,
 			"node_name":    n.Name,
 			"cluster_name": esRes.ClusterName,
 		}
 
+		for k, v := range n.Attributes {
+			tags["node_attribute_"+k] = v
+		}
+
 		for group, stats := range n.Indices {
 			for statName, value := range stats {
 				floatVal, ok := value.(float64)

plugins/elasticsearch/elasticsearch_test.go

@@ -248,9 +248,11 @@ func TestElasticsearch(t *testing.T) {
 	}
 
 	tags := map[string]string{
-		"node_host":    "test",
-		"node_name":    "test.host.com",
 		"cluster_name":          "es-testcluster",
+		"node_attribute_master": "true",
+		"node_id":               "SDFsfSDFsdfFSDSDfSFDSDF",
+		"node_name":             "test.host.com",
+		"node_host":             "test",
 	}
 
 	for key, val := range indicesExpected {