Moving node ID and name fields to module level

elastic · Nov 26, 2018 · 149d3ce · 149d3ce
1 parent 09e940a
commit 149d3ce
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 29 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -4,10 +4,6 @@
     Node
   release: beta
   fields:
-    - name: id
-      type: keyword
-      description: >
-        Node ID
     - name: stats
       type: group
       description: >