Merge branch 'main' into correct-changelog-main-volume

docs/release-notes/8.11.asciidoc

@@ -0,0 +1,28 @@
+[[ecs-release-notes-8.11.0]]
+=== 8.11.0
+
+[[schema-changes-8.11.0]]
+[float]
+==== Schema changes
+
+[[schema-bugfixes-8.11.0]]
+[float]
+===== Bugfixes
+
+* Remove `expected_values` from `threat.*.indicator.name` fields. {ecs_pull}2281[#2281]
+
+[[schema-added-8.11.0]]
+[float]
+===== Added
+
+* Added `volume.*` as beta field set. {ecs_pull}2269[#2269]
+
+[[tooling-changes-8.11.0]]
+[float]
+==== Tooling and artifact changes
+
+[[tooling-bugfixes-8.11.0]]
+[float]
+===== Bugfixes
+
+* Respect reusable.top_level in Beats generator {ecs_pull}2278[#2278]

docs/release-notes/index.asciidoc

@@ -3,6 +3,7 @@
 
 This section summarizes the changes in each release.
 
+* <<ecs-release-notes-8.11.0, {ecs} version 8.11.0>>
 * <<ecs-release-notes-8.10.0, {ecs} version 8.10.0>>
 * <<ecs-release-notes-8.9.0, {ecs} version 8.9.0>>
 * <<ecs-release-notes-8.8.0, {ecs} version 8.8.0>>
@@ -26,6 +27,7 @@ This section summarizes the changes in each release.
 :issue: https://github.com/elastic/ecs/issues/
 :pull: https://github.com/elastic/ecs/pull/
 
+include::8.11.asciidoc[]
 include::8.10.asciidoc[]
 include::8.9.asciidoc[]
 include::8.8.asciidoc[]

scripts/requirements.txt

@@ -1,6 +1,6 @@
 pip
 # License: MIT
-PyYAML==6.0
+PyYAML==6.0.1
 # License: BSD
 gitpython==3.1.37
 # License: BSD

scripts/schema/cleaner.py

@@ -281,7 +281,8 @@ def check_example_value(field: Union[List, FieldEntry], strict: Optional[bool] =
 
     if isinstance(example_value, (list, dict)):
         field_name: str = field['field_details']['name']
-        msg: str = f"Example value for field `{field_name}` contains an object or array which must be quoted to avoid YAML interpretation."
+        msg: str = "Example value for field `{}` contains an object or array which must be quoted to avoid YAML interpretation.".format(
+            field_name)
         strict_warning_handler(msg, strict)
 
     # Examples with arrays must be handled
@@ -295,13 +296,15 @@ def check_example_value(field: Union[List, FieldEntry], strict: Optional[bool] =
         for example_value in example_values:
             match = re.match(pattern, example_value)
             if not match:
-                msg = f"Example value for field `{name}` does not match the regex defined in the pattern attribute: `{pattern}`."
+                msg = "Example value for field `{}` does not match the regex defined in the pattern attribute: `{}`.".format(
+                    name, pattern)
                 strict_warning_handler(msg, strict)
 
     if expected_values:
         for example_value in example_values:
             if example_value not in expected_values:
-                msg = f"Example value `{example_value}` for field `{name}` is not one of the values defined in `expected_value`: {expected_values}."
+                msg = "Example value `{}` for field `{}` is not one of the values defined in `expected_value`: {}.".format(
+                    example_value, name, example_values)
                 strict_warning_handler(msg, strict)