Skip to content

Commit

Permalink
Fix minor formatting issue (elastic#114815)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kkrik-es authored and georgewallace committed Oct 25, 2024
1 parent b563160 commit 0045b35
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/reference/data-streams/tsds.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<<passthrough-dimensions, pass-through>> fields may be configured
<<passthrough-dimensions, Pass-through>> fields may be configured
as dimension containers. In this case, their sub-fields get included to the
routing path automatically.

Expand Down
18 changes: 9 additions & 9 deletions docs/reference/mapping/types/passthrough.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 0045b35

Please sign in to comment.