From 8cf2cb35f64bbbacbd4148d3a1d08664d504beff Mon Sep 17 00:00:00 2001 From: Kostas Krikellas <131142368+kkrik-es@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:39:33 +0300 Subject: [PATCH] Fix minor formatting issue (#114815) The list with two options doesn't get rendered as a list, due to the snippet in between. https://www.elastic.co/guide/en/elasticsearch/reference/master/passthrough.html#passthrough-conflicts --- docs/reference/data-streams/tsds.asciidoc | 2 +- .../mapping/types/passthrough.asciidoc | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/reference/data-streams/tsds.asciidoc b/docs/reference/data-streams/tsds.asciidoc index 6dc559732bf90..461c0a1272e96 100644 --- a/docs/reference/data-streams/tsds.asciidoc +++ b/docs/reference/data-streams/tsds.asciidoc @@ -302,7 +302,7 @@ and can dynamically match new fields. However, {es} will reject any mapping updates that add scripted, runtime, or non-dimension fields that match the `index.routing_path` value. -<> fields may be configured +<> fields may be configured as dimension containers. In this case, their sub-fields get included to the routing path automatically. diff --git a/docs/reference/mapping/types/passthrough.asciidoc b/docs/reference/mapping/types/passthrough.asciidoc index 53b2cc5ed260b..f4f1945d21537 100644 --- a/docs/reference/mapping/types/passthrough.asciidoc +++ b/docs/reference/mapping/types/passthrough.asciidoc @@ -70,9 +70,9 @@ GET my-index-000001/_search It's possible for conflicting names to arise, for fields that are defined within different scopes: - 1. A pass-through object is defined next to a field that has the same name as one of the pass-through object - sub-fields, e.g. - + a. A pass-through object is defined next to a field that has the same name as one of the pass-through object +sub-fields, e.g. ++ [source,console] -------------------------------------------------- PUT my-index-000001/_doc/1 @@ -83,12 +83,12 @@ PUT my-index-000001/_doc/1 "id": "bar" } -------------------------------------------------- ++ +In this case, references to `id` point to the field at the root level, while field `attributes.id` +can only be accessed using the full path. - In this case, references to `id` point to the field at the root level, while field `attributes.id` - can only be accessed using the full path. - - 1. Two (or more) pass-through objects are defined within the same object and contain fields with the same name, e.g. - + b. Two (or more) pass-through objects are defined within the same object and contain fields with the same name, e.g. ++ [source,console] -------------------------------------------------- PUT my-index-000002 @@ -117,7 +117,7 @@ PUT my-index-000002 } } -------------------------------------------------- - ++ In this case, param `priority` is used for conflict resolution, with the higher values taking precedence. In the example above, `resource.attributes` has higher priority than `attributes`, so references to `id` point to the field within `resource.attributes`. `attributes.id` can still be accessed using its full path.