Tidy trailing spaces and newlines (elastic#1667)

* Tidy training spaces and newlines Co-authored-by: Eric Beahan <[email protected]>
kgeller · Nov 18, 2021 · e510ecf · e510ecf
1 parent a859768
commit e510ecf
Show file tree

Hide file tree

Showing 23 changed files with 127 additions and 128 deletions.
diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
@@ -36,6 +36,7 @@ Thanks, you're awesome :-) -->
 
 #### Improvements
 
+* Clean up trailing spaces and additional newlines in schemas #1667
 * Update refs from master to main in USAGE.md etc #1658
 
 #### Deprecated

diff --git a/experimental/generated/beats/fields.ecs.yml b/experimental/generated/beats/fields.ecs.yml
@@ -491,15 +491,15 @@
       in the cloud, the field contains cloud data from the machine the service is
       running on.
 
-      The cloud fields may be self-nested under cloud.origin.* and cloud.target.*  to
-      describe origin or target service''s cloud information in the context of  incoming
-      or outgoing requests, respectively. However, the fieldsets  cloud.origin.* and
-      cloud.target.* must not be confused with the root cloud  fieldset that is used
-      to describe the cloud context of the actual service  under observation. The
-      fieldset cloud.origin.* may only be used in the  context of incoming requests
-      or events to provide the originating service''s  cloud information. The fieldset
-      cloud.target.* may only be used in the  context of outgoing requests or events
-      to describe the target service''s  cloud information.'
+      The cloud fields may be self-nested under cloud.origin.* and cloud.target.*
+      to describe origin or target service''s cloud information in the context of
+      incoming or outgoing requests, respectively. However, the fieldsets cloud.origin.*
+      and cloud.target.* must not be confused with the root cloud fieldset that is
+      used to describe the cloud context of the actual service under observation.
+      The fieldset cloud.origin.* may only be used in the context of incoming requests
+      or events to provide the originating service''s cloud information. The fieldset
+      cloud.target.* may only be used in the context of outgoing requests or events
+      to describe the target service''s cloud information.'
     type: group
     default_field: true
     fields:
@@ -7091,14 +7091,15 @@
       was collected.
 
       These fields help you find and correlate logs for a specific service and version.'
-    footnote: The service fields may be self-nested under service.origin.* and service.target.*  to
-      describe origin or target services in the context of incoming or outgoing requests,  respectively.
-      However, the fieldsets service.origin.* and service.target.* must not be confused
-      with  the root service fieldset that is used to describe the actual service
-      under observation. The fieldset service.origin.* may only be used in the context
-      of incoming requests or  events to describe the originating service of the request.
-      The fieldset service.target.*  may only be used in the context of outgoing requests
-      or events to describe the target  service of the request.
+    footnote: The service fields may be self-nested under service.origin.* and service.target.*
+      to describe origin or target services in the context of incoming or outgoing
+      requests, respectively. However, the fieldsets service.origin.* and service.target.*
+      must not be confused with the root service fieldset that is used to describe
+      the actual service under observation. The fieldset service.origin.* may only
+      be used in the context of incoming requests or events to describe the originating
+      service of the request. The fieldset service.target.* may only be used in the
+      context of outgoing requests or events to describe the target service of the
+      request.
     type: group
     default_field: true
     fields:

diff --git a/experimental/generated/ecs/ecs_nested.yml b/experimental/generated/ecs/ecs_nested.yml
@@ -1246,15 +1246,15 @@ cloud:
     in the cloud, the field contains cloud data from the machine the service is running
     on.
 
-    The cloud fields may be self-nested under cloud.origin.* and cloud.target.*  to
-    describe origin or target service''s cloud information in the context of  incoming
-    or outgoing requests, respectively. However, the fieldsets  cloud.origin.* and
-    cloud.target.* must not be confused with the root cloud  fieldset that is used
-    to describe the cloud context of the actual service  under observation. The fieldset
-    cloud.origin.* may only be used in the  context of incoming requests or events
-    to provide the originating service''s  cloud information. The fieldset cloud.target.*
-    may only be used in the  context of outgoing requests or events to describe the
-    target service''s  cloud information.'
+    The cloud fields may be self-nested under cloud.origin.* and cloud.target.* to
+    describe origin or target service''s cloud information in the context of incoming
+    or outgoing requests, respectively. However, the fieldsets cloud.origin.* and
+    cloud.target.* must not be confused with the root cloud fieldset that is used
+    to describe the cloud context of the actual service under observation. The fieldset
+    cloud.origin.* may only be used in the context of incoming requests or events
+    to provide the originating service''s cloud information. The fieldset cloud.target.*
+    may only be used in the context of outgoing requests or events to describe the
+    target service''s cloud information.'
   group: 2
   name: cloud
   nestings:
@@ -12776,14 +12776,14 @@ service:
       normalize: []
       short: Version of the service.
       type: keyword
-  footnote: The service fields may be self-nested under service.origin.* and service.target.*  to
-    describe origin or target services in the context of incoming or outgoing requests,  respectively.
-    However, the fieldsets service.origin.* and service.target.* must not be confused
-    with  the root service fieldset that is used to describe the actual service under
-    observation. The fieldset service.origin.* may only be used in the context of
-    incoming requests or  events to describe the originating service of the request.
-    The fieldset service.target.*  may only be used in the context of outgoing requests
-    or events to describe the target  service of the request.
+  footnote: The service fields may be self-nested under service.origin.* and service.target.*
+    to describe origin or target services in the context of incoming or outgoing requests,
+    respectively. However, the fieldsets service.origin.* and service.target.* must
+    not be confused with the root service fieldset that is used to describe the actual
+    service under observation. The fieldset service.origin.* may only be used in the
+    context of incoming requests or events to describe the originating service of
+    the request. The fieldset service.target.* may only be used in the context of
+    outgoing requests or events to describe the target service of the request.
   group: 2
   name: service
   nestings:

diff --git a/generated/beats/fields.ecs.yml b/generated/beats/fields.ecs.yml
@@ -441,15 +441,15 @@
       in the cloud, the field contains cloud data from the machine the service is
       running on.
 
-      The cloud fields may be self-nested under cloud.origin.* and cloud.target.*  to
-      describe origin or target service''s cloud information in the context of  incoming
-      or outgoing requests, respectively. However, the fieldsets  cloud.origin.* and
-      cloud.target.* must not be confused with the root cloud  fieldset that is used
-      to describe the cloud context of the actual service  under observation. The
-      fieldset cloud.origin.* may only be used in the  context of incoming requests
-      or events to provide the originating service''s  cloud information. The fieldset
-      cloud.target.* may only be used in the  context of outgoing requests or events
-      to describe the target service''s  cloud information.'
+      The cloud fields may be self-nested under cloud.origin.* and cloud.target.*
+      to describe origin or target service''s cloud information in the context of
+      incoming or outgoing requests, respectively. However, the fieldsets cloud.origin.*
+      and cloud.target.* must not be confused with the root cloud fieldset that is
+      used to describe the cloud context of the actual service under observation.
+      The fieldset cloud.origin.* may only be used in the context of incoming requests
+      or events to provide the originating service''s cloud information. The fieldset
+      cloud.target.* may only be used in the context of outgoing requests or events
+      to describe the target service''s cloud information.'
     type: group
     default_field: true
     fields:
@@ -5782,14 +5782,15 @@
       was collected.
 
       These fields help you find and correlate logs for a specific service and version.'
-    footnote: The service fields may be self-nested under service.origin.* and service.target.*  to
-      describe origin or target services in the context of incoming or outgoing requests,  respectively.
-      However, the fieldsets service.origin.* and service.target.* must not be confused
-      with  the root service fieldset that is used to describe the actual service
-      under observation. The fieldset service.origin.* may only be used in the context
-      of incoming requests or  events to describe the originating service of the request.
-      The fieldset service.target.*  may only be used in the context of outgoing requests
-      or events to describe the target  service of the request.
+    footnote: The service fields may be self-nested under service.origin.* and service.target.*
+      to describe origin or target services in the context of incoming or outgoing
+      requests, respectively. However, the fieldsets service.origin.* and service.target.*
+      must not be confused with the root service fieldset that is used to describe
+      the actual service under observation. The fieldset service.origin.* may only
+      be used in the context of incoming requests or events to describe the originating
+      service of the request. The fieldset service.target.* may only be used in the
+      context of outgoing requests or events to describe the target service of the
+      request.
     type: group
     default_field: true
     fields:

diff --git a/generated/ecs/ecs_nested.yml b/generated/ecs/ecs_nested.yml
@@ -1166,15 +1166,15 @@ cloud:
     in the cloud, the field contains cloud data from the machine the service is running
     on.
 
-    The cloud fields may be self-nested under cloud.origin.* and cloud.target.*  to
-    describe origin or target service''s cloud information in the context of  incoming
-    or outgoing requests, respectively. However, the fieldsets  cloud.origin.* and
-    cloud.target.* must not be confused with the root cloud  fieldset that is used
-    to describe the cloud context of the actual service  under observation. The fieldset
-    cloud.origin.* may only be used in the  context of incoming requests or events
-    to provide the originating service''s  cloud information. The fieldset cloud.target.*
-    may only be used in the  context of outgoing requests or events to describe the
-    target service''s  cloud information.'
+    The cloud fields may be self-nested under cloud.origin.* and cloud.target.* to
+    describe origin or target service''s cloud information in the context of incoming
+    or outgoing requests, respectively. However, the fieldsets cloud.origin.* and
+    cloud.target.* must not be confused with the root cloud fieldset that is used
+    to describe the cloud context of the actual service under observation. The fieldset
+    cloud.origin.* may only be used in the context of incoming requests or events
+    to provide the originating service''s cloud information. The fieldset cloud.target.*
+    may only be used in the context of outgoing requests or events to describe the
+    target service''s cloud information.'
   group: 2
   name: cloud
   nestings:
@@ -10544,14 +10544,14 @@ service:
       normalize: []
       short: Version of the service.
       type: keyword
-  footnote: The service fields may be self-nested under service.origin.* and service.target.*  to
-    describe origin or target services in the context of incoming or outgoing requests,  respectively.
-    However, the fieldsets service.origin.* and service.target.* must not be confused
-    with  the root service fieldset that is used to describe the actual service under
-    observation. The fieldset service.origin.* may only be used in the context of
-    incoming requests or  events to describe the originating service of the request.
-    The fieldset service.target.*  may only be used in the context of outgoing requests
-    or events to describe the target  service of the request.
+  footnote: The service fields may be self-nested under service.origin.* and service.target.*
+    to describe origin or target services in the context of incoming or outgoing requests,
+    respectively. However, the fieldsets service.origin.* and service.target.* must
+    not be confused with the root service fieldset that is used to describe the actual
+    service under observation. The fieldset service.origin.* may only be used in the
+    context of incoming requests or events to describe the originating service of
+    the request. The fieldset service.target.* may only be used in the context of
+    outgoing requests or events to describe the target service of the request.
   group: 2
   name: service
   nestings:

diff --git a/schemas/as.yml b/schemas/as.yml
@@ -55,5 +55,5 @@
         Organization name.
       example: Google LLC
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
diff --git a/schemas/cloud.yml b/schemas/cloud.yml
@@ -29,15 +29,15 @@
     running in the cloud, the field contains cloud data from the machine the
     service is running on.
 
-    The cloud fields may be self-nested under cloud.origin.* and cloud.target.* 
-    to describe origin or target service's cloud information in the context of 
-    incoming or outgoing requests, respectively. However, the fieldsets 
-    cloud.origin.* and cloud.target.* must not be confused with the root cloud 
-    fieldset that is used to describe the cloud context of the actual service 
-    under observation. The fieldset cloud.origin.* may only be used in the 
-    context of incoming requests or events to provide the originating service's 
-    cloud information. The fieldset cloud.target.* may only be used in the 
-    context of outgoing requests or events to describe the target service's 
+    The cloud fields may be self-nested under cloud.origin.* and cloud.target.*
+    to describe origin or target service's cloud information in the context of
+    incoming or outgoing requests, respectively. However, the fieldsets
+    cloud.origin.* and cloud.target.* must not be confused with the root cloud
+    fieldset that is used to describe the cloud context of the actual service
+    under observation. The fieldset cloud.origin.* may only be used in the
+    context of incoming requests or events to provide the originating service's
+    cloud information. The fieldset cloud.target.* may only be used in the
+    context of outgoing requests or events to describe the target service's
     cloud information.
   reusable:
     top_level: true

diff --git a/schemas/elf.yml b/schemas/elf.yml
@@ -204,7 +204,7 @@
       type: keyword
       level: extended
       normalize:
-       - array
+        - array
 
     - name: telfhash
       short: telfhash hash for ELF file.

diff --git a/schemas/error.yml b/schemas/error.yml
@@ -58,5 +58,5 @@
       description: >
         The stack trace of this error in plain text.
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
diff --git a/schemas/faas.yml b/schemas/faas.yml
@@ -62,4 +62,3 @@
       description: >
         The ID of the trigger request , message, event, etc.
       example: 123456789
-
diff --git a/schemas/group.yml b/schemas/group.yml
@@ -52,4 +52,3 @@
         Name of the directory the group is a member of.
 
         For example, an LDAP or Active Directory domain name.
-
diff --git a/schemas/http.yml b/schemas/http.yml
@@ -71,8 +71,8 @@
         The full HTTP request body.
       example: Hello world
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: request.referrer
       level: extended
@@ -110,8 +110,8 @@
         The full HTTP response body.
       example: Hello world
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: version
       level: extended

diff --git a/schemas/organization.yml b/schemas/organization.yml
@@ -34,8 +34,8 @@
       description: >
         Organization name.
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: id
       level: extended

diff --git a/schemas/os.yml b/schemas/os.yml
@@ -58,8 +58,8 @@
       description: >
         Operating system name, without the version.
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: full
       level: extended
@@ -68,8 +68,8 @@
       description: >
         Operating system name, including the version or code name.
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: family
       level: extended

diff --git a/schemas/process.yml b/schemas/process.yml
@@ -70,8 +70,8 @@
         Sometimes called program name or similar.
       example: ssh
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: pgid
       format: string
@@ -91,8 +91,8 @@
         Some arguments may be filtered to protect sensitive information.
       example: "/usr/bin/ssh -l user 10.0.0.16"
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: args
       level: extended
@@ -125,8 +125,8 @@
         Absolute path to the process executable.
       example: /usr/bin/ssh
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: title
       level: extended
@@ -138,8 +138,8 @@
         The proctitle, some times the same as process name. Can also be different:
         for example a browser setting its title to the web page currently opened.
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: thread.id
       format: string
@@ -177,8 +177,8 @@
       description: >
         The working directory of the process.
       multi_fields:
-      - type: match_only_text
-        name: text
+        - type: match_only_text
+          name: text
 
     - name: exit_code
       level: extended

diff --git a/schemas/registry.yml b/schemas/registry.yml
@@ -85,4 +85,3 @@
 
         For Windows registry operations, such as SetValueEx and RegQueryValueEx, this corresponds to the data pointed by `lp_data`.
         This is optional but provides better recoverability and should be populated for REG_BINARY encoded values.
-
diff --git a/schemas/service.yml b/schemas/service.yml
@@ -25,14 +25,14 @@
     These fields help you find and correlate logs for a specific
     service and version.
   footnote: >
-    The service fields may be self-nested under service.origin.* and service.target.* 
-    to describe origin or target services in the context of incoming or outgoing requests, 
+    The service fields may be self-nested under service.origin.* and service.target.*
+    to describe origin or target services in the context of incoming or outgoing requests,
     respectively.
-    However, the fieldsets service.origin.* and service.target.* must not be confused with 
+    However, the fieldsets service.origin.* and service.target.* must not be confused with
     the root service fieldset that is used to describe the actual service under observation.
-    The fieldset service.origin.* may only be used in the context of incoming requests or 
-    events to describe the originating service of the request. The fieldset service.target.* 
-    may only be used in the context of outgoing requests or events to describe the target 
+    The fieldset service.origin.* may only be used in the context of incoming requests or
+    events to describe the originating service of the request. The fieldset service.target.*
+    may only be used in the context of outgoing requests or events to describe the target
     service of the request.
   reusable:
     top_level: true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,4 +62,3 @@
		description: >
		The ID of the trigger request , message, event, etc.
		example: 123456789
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,4 +52,3 @@
		Name of the directory the group is a member of.

		For example, an LDAP or Active Directory domain name.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,4 +85,3 @@

		For Windows registry operations, such as SetValueEx and RegQueryValueEx, this corresponds to the data pointed by `lp_data`.
		This is optional but provides better recoverability and should be populated for REG_BINARY encoded values.