From 149d3ce9032c328d987db8f75903245df58bbcc1 Mon Sep 17 00:00:00 2001
From: Shaunak Kashyap <ycombinator@gmail.com>
Date: Sun, 25 Nov 2018 17:47:30 -0800
Subject: [PATCH] Moving node ID and name fields to module level

---
 metricbeat/docs/fields.asciidoc               | 40 +++++++++----------
 .../module/elasticsearch/_meta/fields.yml     | 10 +++++
 metricbeat/module/elasticsearch/fields.go     |  2 +-
 .../elasticsearch/node/_meta/fields.yml       |  4 --
 .../elasticsearch/node_stats/_meta/fields.yml |  4 --
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index c072145d8ff..54a1df4c170 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -5389,6 +5389,26 @@ type: keyword
 Elasticsearch state id.
 
 
+--
+
+*`elasticsearch.node.id`*::
++
+--
+type: keyword
+
+Node ID
+
+
+--
+
+*`elasticsearch.node.name`*::
++
+--
+type: keyword
+
+Node name.
+
+
 --
 
 [float]
@@ -5928,16 +5948,6 @@ node
 
 
 
-*`elasticsearch.node.name`*::
-+
---
-type: keyword
-
-Node name.
-
-
---
-
 *`elasticsearch.node.version`*::
 +
 --
@@ -6030,16 +6040,6 @@ Node
 
 
 
-*`elasticsearch.node.id`*::
-+
---
-type: keyword
-
-Node ID
-
-
---
-
 [float]
 == stats fields
 
diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml
index 6824317ff74..d457c6f0d43 100644
--- a/metricbeat/module/elasticsearch/_meta/fields.yml
+++ b/metricbeat/module/elasticsearch/_meta/fields.yml
@@ -24,3 +24,13 @@
           type: keyword
           description: >
             Elasticsearch state id.
+
+        - name: node.id
+          type: keyword
+          description: >
+            Node ID
+
+        - name: node.name
+          type: keyword
+          description: >
+            Node name.
diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go
index d8d505c3a4d..8155f4b21fa 100644
--- a/metricbeat/module/elasticsearch/fields.go
+++ b/metricbeat/module/elasticsearch/fields.go
@@ -31,5 +31,5 @@ func init() {
 
 // Asset returns asset data
 func Asset() string {
-	return "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"
+	return "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"
 }
diff --git a/metricbeat/module/elasticsearch/node/_meta/fields.yml b/metricbeat/module/elasticsearch/node/_meta/fields.yml
index 1874c97162d..c1fc72631ad 100644
--- a/metricbeat/module/elasticsearch/node/_meta/fields.yml
+++ b/metricbeat/module/elasticsearch/node/_meta/fields.yml
@@ -4,10 +4,6 @@
     node
   release: beta
   fields:
-    - name: name
-      type: keyword
-      description: >
-        Node name.
     - name: version
       type: keyword
       description: >
diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
index 5768004d885..1b165983054 100644
--- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
+++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
@@ -4,10 +4,6 @@
     Node
   release: beta
   fields:
-    - name: id
-      type: keyword
-      description: >
-        Node ID
     - name: stats
       type: group
       description: >