Fix wrong migration alias for beat.name (#10070)

beat.name had the value of hostname or manually assigned name. This is not agent.type but host.name. Change is applied to ecs-migration.yml and fields.common.yml. Further changes: * Remove double migration entry * Move some fields out of fields.ecs.yml as not needed there anymore. Tests were improved.
elastic · Jan 17, 2019 · d9f51db · d9f51db
1 parent 9d33de0
commit d9f51db
Show file tree

Hide file tree

Showing 19 changed files with 163 additions and 166 deletions.
diff --git a/auditbeat/docs/fields.asciidoc b/auditbeat/docs/fields.asciidoc
@@ -2470,6 +2470,24 @@ type: keyword
 Error type.
 
 
+--
+
+*`beat.name`*::
++
+--
+type: alias
+
+alias to: host.name
+
+--
+
+*`beat.hostname`*::
++
+--
+type: alias
+
+alias to: agent.hostname
+
 --
 
 [[exported-fields-cloud]]
@@ -5693,24 +5711,6 @@ example: 4.4.0-112-generic
 Operating system kernel version as a raw string.
 
 
---
-
-*`beat.name`*::
-+
---
-type: alias
-
-alias to: agent.type
-
---
-
-*`beat.hostname`*::
-+
---
-type: alias
-
-alias to: agent.hostname
-
 --
 
 *`agent.hostname`*::

diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go
diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml
@@ -35,7 +35,7 @@
   alias: false
 
 - from: beat.name
-  to: agent.type
+  to: host.name
   alias6: true
   alias: true
 

diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
@@ -656,6 +656,24 @@ type: keyword
 Error type.
 
 
+--
+
+*`beat.name`*::
++
+--
+type: alias
+
+alias to: host.name
+
+--
+
+*`beat.hostname`*::
++
+--
+type: alias
+
+alias to: agent.hostname
+
 --
 
 [[exported-fields-cloud]]
@@ -3780,24 +3798,6 @@ example: 4.4.0-112-generic
 Operating system kernel version as a raw string.
 
 
---
-
-*`beat.name`*::
-+
---
-type: alias
-
-alias to: agent.type
-
---
-
-*`beat.hostname`*::
-+
---
-type: alias
-
-alias to: agent.hostname
-
 --
 
 *`agent.hostname`*::

diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go
diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -69,6 +69,24 @@ type: keyword
 Error type.
 
 
+--
+
+*`beat.name`*::
++
+--
+type: alias
+
+alias to: host.name
+
+--
+
+*`beat.hostname`*::
++
+--
+type: alias
+
+alias to: agent.hostname
+
 --
 
 [[exported-fields-cloud]]
@@ -3297,24 +3315,6 @@ example: 4.4.0-112-generic
 Operating system kernel version as a raw string.
 
 
---
-
-*`beat.name`*::
-+
---
-type: alias
-
-alias to: agent.type
-
---
-
-*`beat.hostname`*::
-+
---
-type: alias
-
-alias to: agent.hostname
-
 --
 
 *`agent.hostname`*::

diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/journalbeat/docs/fields.asciidoc b/journalbeat/docs/fields.asciidoc
@@ -63,6 +63,24 @@ type: keyword
 Error type.
 
 
+--
+
+*`beat.name`*::
++
+--
+type: alias
+
+alias to: host.name
+
+--
+
+*`beat.hostname`*::
++
+--
+type: alias
+
+alias to: agent.hostname
+
 --
 
 [[exported-fields-cloud]]
@@ -3574,24 +3592,6 @@ example: 4.4.0-112-generic
 Operating system kernel version as a raw string.
 
 
---
-
-*`beat.name`*::
-+
---
-type: alias
-
-alias to: agent.type
-
---
-
-*`beat.hostname`*::
-+
---
-type: alias
-
-alias to: agent.hostname
-
 --
 
 *`agent.hostname`*::

diff --git a/journalbeat/include/fields.go b/journalbeat/include/fields.go
diff --git a/libbeat/_meta/fields.common.yml b/libbeat/_meta/fields.common.yml
@@ -6,7 +6,6 @@
   fields:
     - name: beat.timezone
       type: alias
-      migration: true
       path: event.timezone
       migration: true
 
@@ -25,3 +24,13 @@
           type: keyword
           description: >
             Error type.
+
+    - name: beat.name
+      type: alias
+      path: host.name
+      migration: true
+
+    - name: beat.hostname
+      type: alias
+      path: agent.hostname
+      migration: true
diff --git a/libbeat/_meta/fields.ecs.yml b/libbeat/_meta/fields.ecs.yml
@@ -2214,18 +2214,6 @@
             description: >
               Operating system kernel version as a raw string.
 
-    # Temporary fix to get 7.0 dashboards working.
-    # This must go in the ecs.yml as otherwise tests don't work.
-    - name: beat.name
-      type: alias
-      path: agent.type
-      migration: true
-
-    - name: beat.hostname
-      type: alias
-      path: agent.hostname
-      migration: true
-
     # This is not in ECS.
     # TODO: https://github.com/elastic/ecs/issues/178
     - name: agent.hostname

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -852,6 +852,24 @@ type: keyword
 Error type.
 
 
+--
+
+*`beat.name`*::
++
+--
+type: alias
+
+alias to: host.name
+
+--
+
+*`beat.hostname`*::
++
+--
+type: alias
+
+alias to: agent.hostname
+
 --
 
 [[exported-fields-ceph]]
@@ -6431,24 +6449,6 @@ example: 4.4.0-112-generic
 Operating system kernel version as a raw string.
 
 
---
-
-*`beat.name`*::
-+
---
-type: alias
-
-alias to: agent.type
-
---
-
-*`beat.hostname`*::
-+
---
-type: alias
-
-alias to: agent.hostname
-
 --
 
 *`agent.hostname`*::

diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go
diff --git a/packetbeat/docs/fields.asciidoc b/packetbeat/docs/fields.asciidoc
@@ -482,6 +482,24 @@ type: keyword
 Error type.
 
 
+--
+
+*`beat.name`*::
++
+--
+type: alias
+
+alias to: host.name
+
+--
+
+*`beat.hostname`*::
++
+--
+type: alias
+
+alias to: agent.hostname
+
 --
 
 [[exported-fields-cassandra]]
@@ -5189,24 +5207,6 @@ example: 4.4.0-112-generic
 Operating system kernel version as a raw string.
 
 
---
-
-*`beat.name`*::
-+
---
-type: alias
-
-alias to: agent.type
-
---
-
-*`beat.hostname`*::
-+
---
-type: alias
-
-alias to: agent.hostname
-
 --
 
 *`agent.hostname`*::

diff --git a/packetbeat/include/fields.go b/packetbeat/include/fields.go
diff --git a/winlogbeat/docs/fields.asciidoc b/winlogbeat/docs/fields.asciidoc
@@ -64,6 +64,24 @@ type: keyword
 Error type.
 
 
+--
+
+*`beat.name`*::
++
+--
+type: alias
+
+alias to: host.name
+
+--
+
+*`beat.hostname`*::
++
+--
+type: alias
+
+alias to: agent.hostname
+
 --
 
 [[exported-fields-cloud]]
@@ -3206,24 +3224,6 @@ example: 4.4.0-112-generic
 Operating system kernel version as a raw string.
 
 
---
-
-*`beat.name`*::
-+
---
-type: alias
-
-alias to: agent.type
-
---
-
-*`beat.hostname`*::
-+
---
-type: alias
-
-alias to: agent.hostname
-
 --
 
 *`agent.hostname`*::