[RFC] Faas fields - stage 2 - change faas.trigger type from nested to…

… object (#2194)
elastic · Apr 28, 2023 · 9c30e0d · 9c30e0d
1 parent 2edbde7
commit 9c30e0d
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 77 deletions.
diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
@@ -19,6 +19,7 @@ Thanks, you're awesome :-) -->
 #### Improvements
 
 #### Deprecated
+* Removed `faas.trigger: nested` since we only have one trigger. #2194
 
 ### Tooling and Artifact Changes
 

diff --git a/docs/fields/field-details.asciidoc b/docs/fields/field-details.asciidoc
@@ -3928,22 +3928,6 @@ type: keyword
 
 example: `my-function`
 
-| extended
-
-// ===============================================================
-
-|
-[[field-faas-trigger]]
-<<field-faas-trigger, faas.trigger>>
-
-a| Details about the function trigger.
-
-type: nested
-
-
-
-
-
 | extended
 
 // ===============================================================

diff --git a/experimental/generated/beats/fields.ecs.yml b/experimental/generated/beats/fields.ecs.yml
@@ -2697,11 +2697,6 @@
       description: The name of a serverless function.
       example: my-function
       default_field: false
-    - name: trigger
-      level: extended
-      type: nested
-      description: Details about the function trigger.
-      default_field: false
     - name: trigger.request_id
       level: extended
       type: keyword

diff --git a/experimental/generated/csv/fields.csv b/experimental/generated/csv/fields.csv
@@ -268,7 +268,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
 8.9.0-dev+exp,true,faas,faas.execution,keyword,extended,,af9d5aa4-a685-4c5f-a22b-444f80b3cc28,The execution ID of the current function execution.
 8.9.0-dev+exp,true,faas,faas.id,keyword,extended,,arn:aws:lambda:us-west-2:123456789012:function:my-function,The unique identifier of a serverless function.
 8.9.0-dev+exp,true,faas,faas.name,keyword,extended,,my-function,The name of a serverless function.
-8.9.0-dev+exp,true,faas,faas.trigger,nested,extended,,,Details about the function trigger.
 8.9.0-dev+exp,true,faas,faas.trigger.request_id,keyword,extended,,123456789,"The ID of the trigger request , message, event, etc."
 8.9.0-dev+exp,true,faas,faas.trigger.type,keyword,extended,,http,The trigger for the function execution.
 8.9.0-dev+exp,true,faas,faas.version,keyword,extended,,123,The version of a serverless function.

diff --git a/experimental/generated/ecs/ecs_flat.yml b/experimental/generated/ecs/ecs_flat.yml
@@ -3794,15 +3794,6 @@ faas.name:
   normalize: []
   short: The name of a serverless function.
   type: keyword
-faas.trigger:
-  dashed_name: faas-trigger
-  description: Details about the function trigger.
-  flat_name: faas.trigger
-  level: extended
-  name: trigger
-  normalize: []
-  short: Details about the function trigger.
-  type: nested
 faas.trigger.request_id:
   dashed_name: faas-trigger-request-id
   description: The ID of the trigger request , message, event, etc.

diff --git a/experimental/generated/ecs/ecs_nested.yml b/experimental/generated/ecs/ecs_nested.yml
@@ -4813,15 +4813,6 @@ faas:
       normalize: []
       short: The name of a serverless function.
       type: keyword
-    faas.trigger:
-      dashed_name: faas-trigger
-      description: Details about the function trigger.
-      flat_name: faas.trigger
-      level: extended
-      name: trigger
-      normalize: []
-      short: Details about the function trigger.
-      type: nested
     faas.trigger.request_id:
       dashed_name: faas-trigger-request-id
       description: The ID of the trigger request , message, event, etc.

diff --git a/experimental/generated/elasticsearch/composable/component/faas.json b/experimental/generated/elasticsearch/composable/component/faas.json
@@ -33,8 +33,7 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 }
-              },
-              "type": "nested"
+              }
             },
             "version": {
               "ignore_above": 1024,

diff --git a/experimental/generated/elasticsearch/legacy/template.json b/experimental/generated/elasticsearch/legacy/template.json
@@ -1327,8 +1327,7 @@
                 "ignore_above": 1024,
                 "type": "keyword"
               }
-            },
-            "type": "nested"
+            }
           },
           "version": {
             "ignore_above": 1024,

diff --git a/generated/beats/fields.ecs.yml b/generated/beats/fields.ecs.yml
@@ -2647,11 +2647,6 @@
       description: The name of a serverless function.
       example: my-function
       default_field: false
-    - name: trigger
-      level: extended
-      type: nested
-      description: Details about the function trigger.
-      default_field: false
     - name: trigger.request_id
       level: extended
       type: keyword

diff --git a/generated/csv/fields.csv b/generated/csv/fields.csv
@@ -261,7 +261,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
 8.9.0-dev,true,faas,faas.execution,keyword,extended,,af9d5aa4-a685-4c5f-a22b-444f80b3cc28,The execution ID of the current function execution.
 8.9.0-dev,true,faas,faas.id,keyword,extended,,arn:aws:lambda:us-west-2:123456789012:function:my-function,The unique identifier of a serverless function.
 8.9.0-dev,true,faas,faas.name,keyword,extended,,my-function,The name of a serverless function.
-8.9.0-dev,true,faas,faas.trigger,nested,extended,,,Details about the function trigger.
 8.9.0-dev,true,faas,faas.trigger.request_id,keyword,extended,,123456789,"The ID of the trigger request , message, event, etc."
 8.9.0-dev,true,faas,faas.trigger.type,keyword,extended,,http,The trigger for the function execution.
 8.9.0-dev,true,faas,faas.version,keyword,extended,,123,The version of a serverless function.

diff --git a/generated/ecs/ecs_flat.yml b/generated/ecs/ecs_flat.yml
@@ -3725,15 +3725,6 @@ faas.name:
   normalize: []
   short: The name of a serverless function.
   type: keyword
-faas.trigger:
-  dashed_name: faas-trigger
-  description: Details about the function trigger.
-  flat_name: faas.trigger
-  level: extended
-  name: trigger
-  normalize: []
-  short: Details about the function trigger.
-  type: nested
 faas.trigger.request_id:
   dashed_name: faas-trigger-request-id
   description: The ID of the trigger request , message, event, etc.

diff --git a/generated/ecs/ecs_nested.yml b/generated/ecs/ecs_nested.yml
@@ -4733,15 +4733,6 @@ faas:
       normalize: []
       short: The name of a serverless function.
       type: keyword
-    faas.trigger:
-      dashed_name: faas-trigger
-      description: Details about the function trigger.
-      flat_name: faas.trigger
-      level: extended
-      name: trigger
-      normalize: []
-      short: Details about the function trigger.
-      type: nested
     faas.trigger.request_id:
       dashed_name: faas-trigger-request-id
       description: The ID of the trigger request , message, event, etc.

diff --git a/generated/elasticsearch/composable/component/faas.json b/generated/elasticsearch/composable/component/faas.json
@@ -33,8 +33,7 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 }
-              },
-              "type": "nested"
+              }
             },
             "version": {
               "ignore_above": 1024,

diff --git a/generated/elasticsearch/legacy/template.json b/generated/elasticsearch/legacy/template.json
@@ -1285,8 +1285,7 @@
                 "ignore_above": 1024,
                 "type": "keyword"
               }
-            },
-            "type": "nested"
+            }
           },
           "version": {
             "ignore_above": 1024,

diff --git a/schemas/faas.yml b/schemas/faas.yml
@@ -58,11 +58,6 @@
       type: keyword
       level: extended
       example: "af9d5aa4-a685-4c5f-a22b-444f80b3cc28"
-    - name: trigger
-      level: extended
-      type: nested
-      description: >
-        Details about the function trigger.
     - name: trigger.type
       level: extended
       type: keyword