Merge branch 'main' into x509.serial_number-must

elastic · Nov 14, 2024 · 6638169 · 6638169
2 parents a219029 + 9c55b1d
commit 6638169
Show file tree

Hide file tree

Showing 97 changed files with 3,809 additions and 3,747 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -2,6 +2,8 @@
   "upstream": "elastic/ecs",
   "branches": [
     { "name": "main", "checked": true },
+    "8.x",
+    "8.16",
     "8.11",
     "8.10",
     "8.9",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,35 @@
 # CHANGELOG
 All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.16.0](https://github.com/elastic/ecs/compare/v8.11.0...v8.16.0)
+
+### Schema Changes
+
+#### Bugfixes
+* Fix broken link in docs for vulnerability.id. #2328
+
+#### Added
+
+* Added `volume.*` as beta field set. #2269
+* Advanced `process.env_vars` to GA. #2315
+* Advanced `process.io` and `process.tty` fields to GA. #2317
+* Added `threat.indicator.id`. #2324
+* Added `process.group` to generated schemas. #2335
+
+#### Improvements
+
+* Define base encoding of `x509.serial_number`. #2383
+
+### Tooling and Artifact Changes
+
+#### Bugfixes
+
+* Fix broken link for vulnerabilty.id #2328
+
+#### Added
+
+* Documentation in README.md providing instruction on contributions to ECS during the OTel donation #2325
+
 ## [8.11.0](https://github.com/elastic/ecs/compare/v8.10.0...v8.11.0)
 
 ### Schema Changes

diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
@@ -13,16 +13,9 @@ Thanks, you're awesome :-) -->
 #### Breaking changes
 
 #### Bugfixes
-* Fix broken link in docs for vulnerability.id. #2328
 
 #### Added
 
-* Added `volume.*` as beta field set. #2269
-* Advanced `process.env_vars` to GA. #2315
-* Advanced `process.io` and `process.tty` fields to GA. #2317
-* Added `threat.indicator.id`. #2324
-* Added `process.group` to generated schemas. #2335
-
 #### Improvements
 
 * Define base encoding of `x509.serial_number`. #2383
@@ -38,8 +31,6 @@ Thanks, you're awesome :-) -->
 
 #### Added
 
-* Documentation in README.md providing instruction on contributions to ECS during the OTel donation #2325
-
 #### Improvements
 
 #### Deprecated

diff --git a/docs/fields/fields.asciidoc b/docs/fields/fields.asciidoc
@@ -1,7 +1,7 @@
 [[ecs-field-reference]]
 == {ecs} Field Reference
 
-This is the documentation of ECS version 8.12.0-dev.
+This is the documentation of ECS version 9.0.0-dev.
 
 ECS defines multiple groups of related fields. They are called "field sets".
 The <<ecs-base,Base>> field set is the only one whose fields are defined

diff --git a/docs/index.asciidoc b/docs/index.asciidoc
@@ -13,7 +13,7 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 [[ecs-reference]]
 == Overview
 
-This is the documentation of ECS version 8.12.0-dev.
+This is the documentation of ECS version 9.0.0-dev.
 
 [float]
 === What is ECS?

diff --git a/docs/release-notes/8.16.asciidoc b/docs/release-notes/8.16.asciidoc
@@ -0,0 +1,38 @@
+[[ecs-release-notes-8.16.0]]
+=== 8.16.0
+
+[[schema-changes-8.16.0]]
+[float]
+==== Schema changes
+
+[[schema-bugfixes-8.16.0]]
+[float]
+===== Bugfixes
+* Fix broken link in docs for vulnerability.id. {ecs_pull}2328[#2328]
+
+[[schema-added-8.16.0]]
+[float]
+===== Added
+
+* Added `volume.*` as beta field set. {ecs_pull}2269[#2269]
+* Advanced `process.env_vars` to GA. {ecs_pull}2315[#2315]
+* Advanced `process.io` and `process.tty` fields to GA. {ecs_pull}2317[#2317]
+* Added `threat.indicator.id`. {ecs_pull}2324[#2324]
+* Added `process.group` to generated schemas. {ecs_pull}2335[#2335]
+
+
+[[tooling-changes-8.16.0]]
+[float]
+==== Tooling and artifact changes
+
+[[tooling-bugfixes-8.16.0]]
+[float]
+===== Bugfixes
+* Fix broken link for vulnerabilty.id {ecs_pull}2328[#2328]
+
+[[tooling-added-8.16.0]]
+[float]
+===== Added
+
+* Documentation in README.md providing instruction on contributions to ECS during the OTel donation {ecs_pull}2325[#2325]
+
diff --git a/docs/release-notes/index.asciidoc b/docs/release-notes/index.asciidoc
@@ -3,6 +3,7 @@
 
 This section summarizes the changes in each release.
 
+* <<ecs-release-notes-8.16.0, {ecs} version 8.16.0>>
 * <<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>>
@@ -27,6 +28,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.16.asciidoc[]
 include::8.11.asciidoc[]
 include::8.10.asciidoc[]
 include::8.9.asciidoc[]

diff --git a/experimental/generated/beats/fields.ecs.yml b/experimental/generated/beats/fields.ecs.yml
@@ -1,5 +1,5 @@
 # WARNING! Do not edit this file directly, it was generated by the ECS project,
-# based on ECS version 8.12.0-dev+exp.
+# based on ECS version 9.0.0-dev+exp.
 # Please visit https://github.com/elastic/ecs to suggest changes to ECS fields.
 
 - key: ecs

diff --git a/experimental/generated/csv/fields.csv b/experimental/generated/csv/fields.csv
diff --git a/experimental/generated/elasticsearch/composable/component/agent.json b/experimental/generated/elasticsearch/composable/component/agent.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-agent.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/base.json b/experimental/generated/elasticsearch/composable/component/base.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-base.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/cgroup.json b/experimental/generated/elasticsearch/composable/component/cgroup.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-cgroup.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/client.json b/experimental/generated/elasticsearch/composable/component/client.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-client.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/cloud.json b/experimental/generated/elasticsearch/composable/component/cloud.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-cloud.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/container.json b/experimental/generated/elasticsearch/composable/component/container.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-container.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/data_stream.json b/experimental/generated/elasticsearch/composable/component/data_stream.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-data_stream.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/destination.json b/experimental/generated/elasticsearch/composable/component/destination.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-destination.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/device.json b/experimental/generated/elasticsearch/composable/component/device.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-device.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/dll.json b/experimental/generated/elasticsearch/composable/component/dll.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-dll.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/dns.json b/experimental/generated/elasticsearch/composable/component/dns.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-dns.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/ecs.json b/experimental/generated/elasticsearch/composable/component/ecs.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-ecs.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/email.json b/experimental/generated/elasticsearch/composable/component/email.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-email.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/error.json b/experimental/generated/elasticsearch/composable/component/error.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-error.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/event.json b/experimental/generated/elasticsearch/composable/component/event.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-event.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/faas.json b/experimental/generated/elasticsearch/composable/component/faas.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-faas.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/file.json b/experimental/generated/elasticsearch/composable/component/file.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-file.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/group.json b/experimental/generated/elasticsearch/composable/component/group.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-group.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/host.json b/experimental/generated/elasticsearch/composable/component/host.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-host.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/http.json b/experimental/generated/elasticsearch/composable/component/http.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-http.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/log.json b/experimental/generated/elasticsearch/composable/component/log.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-log.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/network.json b/experimental/generated/elasticsearch/composable/component/network.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-network.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/observer.json b/experimental/generated/elasticsearch/composable/component/observer.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-observer.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/orchestrator.json b/experimental/generated/elasticsearch/composable/component/orchestrator.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-orchestrator.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/organization.json b/experimental/generated/elasticsearch/composable/component/organization.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-organization.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/package.json b/experimental/generated/elasticsearch/composable/component/package.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-package.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {

diff --git a/experimental/generated/elasticsearch/composable/component/process.json b/experimental/generated/elasticsearch/composable/component/process.json
@@ -1,7 +1,7 @@
 {
   "_meta": {
     "documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-process.html",
-    "ecs_version": "8.12.0-dev+exp"
+    "ecs_version": "9.0.0-dev+exp"
   },
   "template": {
     "mappings": {