7.11 wildcard keywords (elastic#4657)

* fix: Revert using wildcards in template follow up on elastic#4655 fixes elastic#4652
simitt · Feb 1, 2021 · 2652950 · 2652950
1 parent cc2ab7e
commit 2652950
Show file tree

Hide file tree

Showing 14 changed files with 160 additions and 161 deletions.
diff --git a/apmpackage/apm/0.1.0/data_stream/app_metrics/fields/ecs.yml b/apmpackage/apm/0.1.0/data_stream/app_metrics/fields/ecs.yml
@@ -90,7 +90,7 @@
   description: |
     The architecture of the host the event was recorded on.
 - name: host.hostname
-  type: wildcard
+  type: keyword
   description: |
     The hostname of the host the event was recorded on.
 - name: host.ip
@@ -141,7 +141,7 @@
   description: |
     Numeric ID of the service's parent process.
 - name: process.title
-  type: wildcard
+  type: keyword
   description: |
     Service process title.
 - name: service.name
@@ -161,15 +161,15 @@
   description: |
     IP address of the source of a recorded event. This is typically obtained from a request's X-Forwarded-For or the X-Real-IP header or falls back to a given configuration for remote address.
 - name: user.email
-  type: wildcard
+  type: keyword
   description: |
     Email of the logged in user.
 - name: user.id
   type: keyword
   description: |
     Identifier of the logged in user.
 - name: user.name
-  type: wildcard
+  type: keyword
   description: |
     The username of the logged in user.
 - name: user_agent.device.name
@@ -181,7 +181,7 @@
   description: |
     Name of the user agent.
 - name: user_agent.original
-  type: wildcard
+  type: keyword
   description: |
     Unparsed version of the user_agent.
   multi_fields:
@@ -192,15 +192,15 @@
   description: |
     OS family (such as redhat, debian, freebsd, windows).
 - name: user_agent.os.full
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, including the version or code name.
 - name: user_agent.os.kernel
   type: keyword
   description: |
     Operating system kernel version as a raw string.
 - name: user_agent.os.name
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, without the version.
 - name: user_agent.os.platform

diff --git a/apmpackage/apm/0.1.0/data_stream/error_logs/fields/ecs.yml b/apmpackage/apm/0.1.0/data_stream/error_logs/fields/ecs.yml
@@ -94,7 +94,7 @@
   description: |
     The architecture of the host the event was recorded on.
 - name: host.hostname
-  type: wildcard
+  type: keyword
   description: |
     The hostname of the host the event was recorded on.
 - name: host.ip
@@ -114,7 +114,7 @@
   description: |
     The http method of the request leading to this event.
 - name: http.request.referrer
-  type: wildcard
+  type: keyword
   description: Referrer for this HTTP request.
   ignore_above: 1024
 - name: http.response.status_code
@@ -161,7 +161,7 @@
   description: |
     Numeric ID of the service's parent process.
 - name: process.title
-  type: wildcard
+  type: keyword
   description: |
     Service process title.
 - name: service.name
@@ -189,19 +189,19 @@
   description: |
     The transaction ID.
 - name: url.domain
-  type: wildcard
+  type: keyword
   description: |
     The hostname of the request, e.g. "example.com".
 - name: url.fragment
   type: keyword
   description: |
     A fragment specifying a location in a web page , e.g. "top".
 - name: url.full
-  type: wildcard
+  type: keyword
   description: |
     The full, possibly agent-assembled URL of the request, e.g https://example.com:443/search?q=elasticsearch#top.
 - name: url.path
-  type: wildcard
+  type: keyword
   description: |
     The path of the request, e.g. "/search".
 - name: url.port
@@ -217,15 +217,15 @@
   description: |
     The protocol of the request, e.g. "https:".
 - name: user.email
-  type: wildcard
+  type: keyword
   description: |
     Email of the logged in user.
 - name: user.id
   type: keyword
   description: |
     Identifier of the logged in user.
 - name: user.name
-  type: wildcard
+  type: keyword
   description: |
     The username of the logged in user.
 - name: user_agent.device.name
@@ -237,7 +237,7 @@
   description: |
     Name of the user agent.
 - name: user_agent.original
-  type: wildcard
+  type: keyword
   description: |
     Unparsed version of the user_agent.
   multi_fields:
@@ -248,15 +248,15 @@
   description: |
     OS family (such as redhat, debian, freebsd, windows).
 - name: user_agent.os.full
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, including the version or code name.
 - name: user_agent.os.kernel
   type: keyword
   description: |
     Operating system kernel version as a raw string.
 - name: user_agent.os.name
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, without the version.
 - name: user_agent.os.platform

diff --git a/apmpackage/apm/0.1.0/data_stream/internal_metrics/fields/ecs.yml b/apmpackage/apm/0.1.0/data_stream/internal_metrics/fields/ecs.yml
@@ -96,7 +96,7 @@
   description: |
     The architecture of the host the event was recorded on.
 - name: host.hostname
-  type: wildcard
+  type: keyword
   description: |
     The hostname of the host the event was recorded on.
 - name: host.ip
@@ -147,7 +147,7 @@
   description: |
     Numeric ID of the service's parent process.
 - name: process.title
-  type: wildcard
+  type: keyword
   description: |
     Service process title.
 - name: service.name
@@ -171,15 +171,15 @@
   description: |
     The transaction ID.
 - name: user.email
-  type: wildcard
+  type: keyword
   description: |
     Email of the logged in user.
 - name: user.id
   type: keyword
   description: |
     Identifier of the logged in user.
 - name: user.name
-  type: wildcard
+  type: keyword
   description: |
     The username of the logged in user.
 - name: user_agent.device.name
@@ -191,7 +191,7 @@
   description: |
     Name of the user agent.
 - name: user_agent.original
-  type: wildcard
+  type: keyword
   description: |
     Unparsed version of the user_agent.
   multi_fields:
@@ -202,15 +202,15 @@
   description: |
     OS family (such as redhat, debian, freebsd, windows).
 - name: user_agent.os.full
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, including the version or code name.
 - name: user_agent.os.kernel
   type: keyword
   description: |
     Operating system kernel version as a raw string.
 - name: user_agent.os.name
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, without the version.
 - name: user_agent.os.platform

diff --git a/apmpackage/apm/0.1.0/data_stream/profile_metrics/fields/ecs.yml b/apmpackage/apm/0.1.0/data_stream/profile_metrics/fields/ecs.yml
@@ -90,7 +90,7 @@
   description: |
     The architecture of the host the event was recorded on.
 - name: host.hostname
-  type: wildcard
+  type: keyword
   description: |
     The hostname of the host the event was recorded on.
 - name: host.ip
@@ -141,7 +141,7 @@
   description: |
     Numeric ID of the service's parent process.
 - name: process.title
-  type: wildcard
+  type: keyword
   description: |
     Service process title.
 - name: service.name
@@ -161,15 +161,15 @@
   description: |
     IP address of the source of a recorded event. This is typically obtained from a request's X-Forwarded-For or the X-Real-IP header or falls back to a given configuration for remote address.
 - name: user.email
-  type: wildcard
+  type: keyword
   description: |
     Email of the logged in user.
 - name: user.id
   type: keyword
   description: |
     Identifier of the logged in user.
 - name: user.name
-  type: wildcard
+  type: keyword
   description: |
     The username of the logged in user.
 - name: user_agent.device.name
@@ -181,7 +181,7 @@
   description: |
     Name of the user agent.
 - name: user_agent.original
-  type: wildcard
+  type: keyword
   description: |
     Unparsed version of the user_agent.
   multi_fields:
@@ -192,15 +192,15 @@
   description: |
     OS family (such as redhat, debian, freebsd, windows).
 - name: user_agent.os.full
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, including the version or code name.
 - name: user_agent.os.kernel
   type: keyword
   description: |
     Operating system kernel version as a raw string.
 - name: user_agent.os.name
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, without the version.
 - name: user_agent.os.platform

diff --git a/apmpackage/apm/0.1.0/data_stream/traces/fields/ecs.yml b/apmpackage/apm/0.1.0/data_stream/traces/fields/ecs.yml
@@ -96,7 +96,7 @@
   description: |
     The architecture of the host the event was recorded on.
 - name: host.hostname
-  type: wildcard
+  type: keyword
   description: |
     The hostname of the host the event was recorded on.
 - name: host.ip
@@ -116,7 +116,7 @@
   description: |
     The http method of the request leading to this event.
 - name: http.request.referrer
-  type: wildcard
+  type: keyword
   description: Referrer for this HTTP request.
   ignore_above: 1024
 - name: http.response.status_code
@@ -163,7 +163,7 @@
   description: |
     Numeric ID of the service's parent process.
 - name: process.title
-  type: wildcard
+  type: keyword
   description: |
     Service process title.
 - name: service.name
@@ -195,19 +195,19 @@
   description: |
     The transaction ID.
 - name: url.domain
-  type: wildcard
+  type: keyword
   description: |
     The hostname of the request, e.g. "example.com".
 - name: url.fragment
   type: keyword
   description: |
     A fragment specifying a location in a web page , e.g. "top".
 - name: url.full
-  type: wildcard
+  type: keyword
   description: |
     The full, possibly agent-assembled URL of the request, e.g https://example.com:443/search?q=elasticsearch#top.
 - name: url.path
-  type: wildcard
+  type: keyword
   description: |
     The path of the request, e.g. "/search".
 - name: url.port
@@ -223,15 +223,15 @@
   description: |
     The protocol of the request, e.g. "https:".
 - name: user.email
-  type: wildcard
+  type: keyword
   description: |
     Email of the logged in user.
 - name: user.id
   type: keyword
   description: |
     Identifier of the logged in user.
 - name: user.name
-  type: wildcard
+  type: keyword
   description: |
     The username of the logged in user.
 - name: user_agent.device.name
@@ -243,7 +243,7 @@
   description: |
     Name of the user agent.
 - name: user_agent.original
-  type: wildcard
+  type: keyword
   description: |
     Unparsed version of the user_agent.
   multi_fields:
@@ -254,15 +254,15 @@
   description: |
     OS family (such as redhat, debian, freebsd, windows).
 - name: user_agent.os.full
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, including the version or code name.
 - name: user_agent.os.kernel
   type: keyword
   description: |
     Operating system kernel version as a raw string.
 - name: user_agent.os.name
-  type: wildcard
+  type: keyword
   description: |
     Operating system name, without the version.
 - name: user_agent.os.platform