add elasticsearch.cluster.id to logstash metricsets (#29625)

* add elasticsearch.cluster.id to logstash metricsets * changelog entry
elastic · Dec 29, 2021 · 1386a04 · 1386a04
1 parent 4ae6306
commit 1386a04
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 5 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -152,6 +152,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add `container.id` and `container.runtime` ECS fields in container metricset. {pull}29560[29560]
 - Add `memory.workingset.limit.pct` field in Kubernetes container/pod metricset. {pull}29547[29547]
 - Add `elasticsearch.cluster.id` field to Beat and Kibana modules. {pull}29577[29577]
+- Add `elasticsearch.cluster.id` field to Logstash module. {pull}29625[29625]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -46325,6 +46325,13 @@ alias to: logstash.node.state.pipeline.hash
 --
 
 
+*`logstash.elasticsearch.cluster.id`*::
++
+--
+type: keyword
+
+--
+
 [float]
 === node
 

diff --git a/metricbeat/module/logstash/_meta/fields.yml b/metricbeat/module/logstash/_meta/fields.yml
@@ -104,3 +104,5 @@
     - name: logstash
       type: group
       fields:
+        - name: elasticsearch.cluster.id
+          type: keyword
diff --git a/metricbeat/module/logstash/fields.go b/metricbeat/module/logstash/fields.go
diff --git a/metricbeat/module/logstash/node/_meta/data.json b/metricbeat/module/logstash/node/_meta/data.json
@@ -9,6 +9,11 @@
         "cluster": {
             "id": "VUwnkX_lTzCFP9VUoXT1IQ"
         },
+        "elasticsearch": {
+            "cluster": {
+                "id": "VUwnkX_lTzCFP9VUoXT1IQ"
+            }
+        },
         "node": {
             "host": "7dc1b688baf4",
             "id": "9a1f83e1-52b9-4625-a98a-6aa336f41719",
@@ -101,4 +106,4 @@
         "type": "logstash",
         "version": "7.12.0"
     }
-}
+}
diff --git a/metricbeat/module/logstash/node/data.go b/metricbeat/module/logstash/node/data.go
@@ -122,6 +122,7 @@ func eventMapping(r mb.ReporterV2, content []byte, pipelines []logstash.Pipeline
 
 			if clusterUUID != "" {
 				event.ModuleFields.Put("cluster.id", clusterUUID)
+				event.ModuleFields.Put("elasticsearch.cluster.id", clusterUUID)
 			}
 
 			event.ID = pipeline.EphemeralID

diff --git a/metricbeat/module/logstash/node_stats/_meta/data.json b/metricbeat/module/logstash/node_stats/_meta/data.json
@@ -6,7 +6,14 @@
         "module": "logstash"
     },
     "logstash": {
-        "cluster.id": "VUwnkX_lTzCFP9VUoXT1IQ",
+        "cluster": {
+           "id": "VUwnkX_lTzCFP9VUoXT1IQ"
+        },
+        "elasticsearch": {
+            "cluster": {
+               "id": "VUwnkX_lTzCFP9VUoXT1IQ"
+            }
+        },
         "node": {
             "stats": {
                 "events": {
@@ -136,4 +143,4 @@
         "type": "logstash",
         "version": "7.12.0"
     }
-}
+}
diff --git a/metricbeat/module/logstash/node_stats/data.go b/metricbeat/module/logstash/node_stats/data.go
@@ -204,7 +204,8 @@ func eventMapping(r mb.ReporterV2, content []byte, isXpack bool) error {
 		event.RootFields.Put("service.version", nodeStats.Version)
 
 		if clusterUUID != "" {
-			event.ModuleFields["cluster.id"] = clusterUUID
+			event.ModuleFields.Put("cluster.id", clusterUUID)
+			event.ModuleFields.Put("elasticsearch.cluster.id", clusterUUID)
 		}
 
 		// xpack.enabled in config using standalone metricbeat writes to `.monitoring` instead of `metricbeat-*`