Index cluster_uuid in elasticsearch/shard metricset (#8770)

This PR teaches the `elasticsearch/shard` metricset to index the Elasticsearch `cluster_uuid` as the module-level `cluster.id` field.
elastic · Nov 1, 2018 · 2a5fbbc · 2a5fbbc
1 parent bb93d05
commit 2a5fbbc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/metricbeat/module/elasticsearch/shard/_meta/data.json b/metricbeat/module/elasticsearch/shard/_meta/data.json
@@ -6,6 +6,7 @@
     },
     "elasticsearch": {
         "cluster": {
+            "id": "91RpCx2xSQ21pVPTZfDK0Q",
             "name": "elasticsearch",
             "state": {
                 "id": "MBE4XrQOSf6ScXRTuCO1Pw"
@@ -20,6 +21,9 @@
         "shard": {
             "number": 0,
             "primary": true,
+            "relocating_node": {
+                "name": null
+            },
             "state": "STARTED"
         }
     },

diff --git a/metricbeat/module/elasticsearch/shard/data.go b/metricbeat/module/elasticsearch/shard/data.go
@@ -40,6 +40,7 @@ var (
 )
 
 type stateStruct struct {
+	ClusterID   string `json:"cluster_uuid"`
 	ClusterName string `json:"cluster_name"`
 	StateID     string `json:"state_uuid"`
 	MasterNode  string `json:"master_node"`
@@ -73,6 +74,7 @@ func eventsMapping(r mb.ReporterV2, content []byte) error {
 
 				event.ModuleFields = common.MapStr{}
 				event.ModuleFields.Put("cluster.state.id", stateData.StateID)
+				event.ModuleFields.Put("cluster.id", stateData.ClusterID)
 				event.ModuleFields.Put("cluster.name", stateData.ClusterName)
 
 				fields, err := schema.Apply(shard)