Skip to content

Commit

Permalink
Merge branch 'main' into llm-security-fields
Browse files Browse the repository at this point in the history
  • Loading branch information
peasead authored Nov 12, 2024
2 parents 161ce66 + 2ff030d commit 9fc6c66
Show file tree
Hide file tree
Showing 93 changed files with 3,740 additions and 3,738 deletions.
2 changes: 2 additions & 0 deletions .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"upstream": "elastic/ecs",
"branches": [
{ "name": "main", "checked": true },
"8.x",
"8.16",
"8.11",
"8.10",
"8.9",
Expand Down
2 changes: 1 addition & 1 deletion docs/fields/fields.asciidoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion experimental/generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3,574 changes: 1,787 additions & 1,787 deletions experimental/generated/csv/fields.csv

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-registry.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-related.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-rule.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-server.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-service.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-source.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-threat.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-tls.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-tracing.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-url.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-user.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-user_agent.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_meta": {
"documentation": "https://www.elastic.co/guide/en/ecs/current/ecs-volume.html",
"ecs_version": "8.12.0-dev+exp"
"ecs_version": "9.0.0-dev+exp"
},
"template": {
"mappings": {
Expand Down
Loading

0 comments on commit 9fc6c66

Please sign in to comment.