From c77b1d40e7b3e9b19e65ec2f5b3b58af6c00b9ab Mon Sep 17 00:00:00 2001 From: Eric Beahan Date: Wed, 17 Feb 2021 21:55:15 -0600 Subject: [PATCH] Stage 3 changes for RFC 0007 - remove beta attribute (#1271) --- CHANGELOG.next.md | 4 ++++ docs/field-details.asciidoc | 15 ++++++--------- experimental/generated/ecs/ecs_nested.yml | 12 +++--------- generated/ecs/ecs_nested.yml | 12 +++--------- schemas/user.yml | 3 --- 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md index bb9e931c49..002b86386e 100644 --- a/CHANGELOG.next.md +++ b/CHANGELOG.next.md @@ -9,6 +9,10 @@ Thanks, you're awesome :-) --> ## Unreleased ### Schema Changes + +#### Improvements + +* `user.changes.*`, `user.effective.*`, and `user.target.*` field reuses are GA. #1271 ### Tooling and Artifact Changes #### Breaking changes diff --git a/docs/field-details.asciidoc b/docs/field-details.asciidoc index 18fd6dd687..c9f424e409 100644 --- a/docs/field-details.asciidoc +++ b/docs/field-details.asciidoc @@ -7990,16 +7990,14 @@ Note also that the `user` fields may be used directly at the root of the events. // =============================================================== -| <>| beta:[ Reusing the user fields in this location is currently considered beta.] - -Fields to describe the user relevant to the event. +| <> +| Fields to describe the user relevant to the event. // =============================================================== -| <>| beta:[ Reusing the user fields in this location is currently considered beta.] - -Fields to describe the user relevant to the event. +| <> +| Fields to describe the user relevant to the event. // =============================================================== @@ -8010,9 +8008,8 @@ Fields to describe the user relevant to the event. // =============================================================== -| <>| beta:[ Reusing the user fields in this location is currently considered beta.] - -Fields to describe the user relevant to the event. +| <> +| Fields to describe the user relevant to the event. // =============================================================== diff --git a/experimental/generated/ecs/ecs_nested.yml b/experimental/generated/ecs/ecs_nested.yml index 5c39e8b51f..cd00f781a0 100644 --- a/experimental/generated/ecs/ecs_nested.yml +++ b/experimental/generated/ecs/ecs_nested.yml @@ -12570,31 +12570,25 @@ user: full: source.user - as: target at: user - beta: Reusing the user fields in this location is currently considered beta. full: user.target - as: effective at: user - beta: Reusing the user fields in this location is currently considered beta. full: user.effective - as: changes at: user - beta: Reusing the user fields in this location is currently considered beta. full: user.changes top_level: true reused_here: - full: user.group schema_name: group short: User's group relevant to the event. - - beta: Reusing the user fields in this location is currently considered beta. - full: user.target + - full: user.target schema_name: user short: Fields to describe the user relevant to the event. - - beta: Reusing the user fields in this location is currently considered beta. - full: user.effective + - full: user.effective schema_name: user short: Fields to describe the user relevant to the event. - - beta: Reusing the user fields in this location is currently considered beta. - full: user.changes + - full: user.changes schema_name: user short: Fields to describe the user relevant to the event. short: Fields to describe the user relevant to the event. diff --git a/generated/ecs/ecs_nested.yml b/generated/ecs/ecs_nested.yml index 24ddb6be63..f1da0bd933 100644 --- a/generated/ecs/ecs_nested.yml +++ b/generated/ecs/ecs_nested.yml @@ -10777,31 +10777,25 @@ user: full: source.user - as: target at: user - beta: Reusing the user fields in this location is currently considered beta. full: user.target - as: effective at: user - beta: Reusing the user fields in this location is currently considered beta. full: user.effective - as: changes at: user - beta: Reusing the user fields in this location is currently considered beta. full: user.changes top_level: true reused_here: - full: user.group schema_name: group short: User's group relevant to the event. - - beta: Reusing the user fields in this location is currently considered beta. - full: user.target + - full: user.target schema_name: user short: Fields to describe the user relevant to the event. - - beta: Reusing the user fields in this location is currently considered beta. - full: user.effective + - full: user.effective schema_name: user short: Fields to describe the user relevant to the event. - - beta: Reusing the user fields in this location is currently considered beta. - full: user.changes + - full: user.changes schema_name: user short: Fields to describe the user relevant to the event. short: Fields to describe the user relevant to the event. diff --git a/schemas/user.yml b/schemas/user.yml index 0fe7a32411..ce5a45e816 100644 --- a/schemas/user.yml +++ b/schemas/user.yml @@ -20,13 +20,10 @@ - source - at: user as: target - beta: Reusing the user fields in this location is currently considered beta. - at: user as: effective - beta: Reusing the user fields in this location is currently considered beta. - at: user as: changes - beta: Reusing the user fields in this location is currently considered beta. # TODO Temporarily commented out to simplify initial rewrite review