From 9af39bbb7dfeb4a8e083a06ec93c5c6d756d22fc Mon Sep 17 00:00:00 2001
From: dupondje <jean-louis@dupond.be>
Date: Wed, 3 Jul 2019 22:04:07 +0200
Subject: [PATCH] Add node roles tag to elasticsearch input (#6064)

---
 plugins/inputs/elasticsearch/elasticsearch.go      |  4 ++++
 plugins/inputs/elasticsearch/elasticsearch_test.go |  1 +
 plugins/inputs/elasticsearch/testdata_test.go      | 10 ++++++++++
 3 files changed, 15 insertions(+)

diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go
index 59b21f2cd..70377320f 100644
--- a/plugins/inputs/elasticsearch/elasticsearch.go
+++ b/plugins/inputs/elasticsearch/elasticsearch.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"regexp"
+	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -27,6 +28,7 @@ const statsPathLocal = "/_nodes/_local/stats"
 type nodeStat struct {
 	Host       string            `json:"host"`
 	Name       string            `json:"name"`
+	Roles      []string          `json:"roles"`
 	Attributes map[string]string `json:"attributes"`
 	Indices    interface{}       `json:"indices"`
 	OS         interface{}       `json:"os"`
@@ -326,11 +328,13 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) er
 	}
 
 	for id, n := range nodeStats.Nodes {
+		sort.Strings(n.Roles)
 		tags := map[string]string{
 			"node_id":      id,
 			"node_host":    n.Host,
 			"node_name":    n.Name,
 			"cluster_name": nodeStats.ClusterName,
+			"node_roles":   strings.Join(n.Roles, ","),
 		}
 
 		for k, v := range n.Attributes {
diff --git a/plugins/inputs/elasticsearch/elasticsearch_test.go b/plugins/inputs/elasticsearch/elasticsearch_test.go
index 298784132..4bf5c6a55 100644
--- a/plugins/inputs/elasticsearch/elasticsearch_test.go
+++ b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -21,6 +21,7 @@ func defaultTags() map[string]string {
 		"node_id":               "SDFsfSDFsdfFSDSDfSFDSDF",
 		"node_name":             "test.host.com",
 		"node_host":             "test",
+		"node_roles":            "data,ingest,master",
 	}
 }
 func defaultServerInfo() serverInfo {
diff --git a/plugins/inputs/elasticsearch/testdata_test.go b/plugins/inputs/elasticsearch/testdata_test.go
index ffdf9559d..c637bb9a9 100644
--- a/plugins/inputs/elasticsearch/testdata_test.go
+++ b/plugins/inputs/elasticsearch/testdata_test.go
@@ -117,6 +117,11 @@ const nodeStatsResponse = `
         "inet[/127.0.0.1:9300]",
         "NONE"
       ],
+      "roles": [
+        "master",
+        "data",
+        "ingest"
+      ],
       "attributes": {
         "master": "true"
       },
@@ -945,6 +950,11 @@ const nodeStatsResponseJVMProcess = `
         "inet[/127.0.0.1:9300]",
         "NONE"
       ],
+      "roles": [
+        "master",
+        "data",
+        "ingest"
+      ],
       "attributes": {
         "master": "true"
       },