Merge branch 'main' into main

elastic · Aug 18, 2022 · a9020bd · a9020bd
2 parents 6ccf3f0 + 474ba6d
commit a9020bd
Show file tree

Hide file tree

Showing 118 changed files with 6,141 additions and 3,451 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -2,6 +2,7 @@
   "upstream": "elastic/ecs",
   "branches": [
     { "name": "main", "checked": true },
+    "8.5",
     "8.4",
     "8.3",
     "8.2",

diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
@@ -16,6 +16,8 @@ Thanks, you're awesome :-) -->
 
 #### Added
 
+* Added `device.*` field set as beta. #2030
+
 #### Improvements
 
 #### Deprecated
@@ -32,7 +34,7 @@ Thanks, you're awesome :-) -->
 
 #### Deprecated
 
-## 8.4.0 (Soft Feature Freeze)
+## 8.5.0 (Soft Feature Freeze)
 
 ### Schema Changes
 
@@ -42,14 +44,14 @@ Thanks, you're awesome :-) -->
 
 #### Added
 
-* Initial set of `expected_values`. #1962
-* Adding `service.node.roles`. #1981
+* Adding `risk.*` fields as experimental. #1994, #2010
 
 #### Improvements
 
-#### Deprecated
+* Advances `threat.enrichments.indicator` to GA. #1928
+* Added `ios` and `android` as valid values for `os.type` #1999
 
-#### Removed
+#### Deprecated
 
 ### Tooling and Artifact Changes
 
@@ -61,6 +63,25 @@ Thanks, you're awesome :-) -->
 
 #### Added
 
+#### Improvements
+
+#### Deprecated
+
+## 8.4.0 (Hard Feature Freeze)
+
+### Schema Changes
+
+#### Added
+
+* Initial set of `expected_values`. #1962
+* Adding `service.node.roles`. #1981
+
+### Tooling and Artifact Changes
+
+#### Breaking changes
+
+#### Added
+
 * Introduce `expected_values` attribute. #1952
 
 #### Improvements
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
       "upstream": "elastic/ecs",
       "branches": [
         { "name": "main", "checked": true },
+        "8.5",
         "8.4",
         "8.3",
         "8.2",
@@ Expand Down @@