elastic · elasticsearchmachine · Aug 19, 2025 · Aug 19, 2025 · Aug 19, 2025 · Aug 19, 2025
diff --git a/docs/redirects.yml b/docs/redirects.yml
@@ -22,4 +22,65 @@ redirects:
       - to: 'reference/elasticsearch/rest-apis/retrievers/rule-retriever.md'
         anchors: {'rule-retriever'}
       - to: 'reference/elasticsearch/rest-apis/retrievers/pinned-retriever.md'
-        anchors: {'pinned-retriever'}
+        anchors: {'pinned-retriever'}
+
+  # ESQL command redirects - split from aggregate pages to individual pages
+  'reference/query-languages/esql/commands/source-commands.md':
+    to: 'reference/query-languages/esql/commands/source-commands.md'
+    anchors: {} # pass-through unlisted anchors in the `many` ruleset
+    many:
+      - to: 'reference/query-languages/esql/commands/from.md'
+        anchors: {'esql-from'}
+      - to: 'reference/query-languages/esql/commands/row.md'
+        anchors: {'esql-row'}
+      - to: 'reference/query-languages/esql/commands/show.md'
+        anchors: {'esql-show'}
+
+  # Handle old anchor references to esql-commands.md
+  'reference/query-languages/esql/esql-commands.md':
+    to: 'reference/query-languages/esql/esql-commands.md'
+    anchors: {} # pass-through unlisted anchors in the `many` ruleset
+    many:
+      - to: 'reference/query-languages/esql/commands/source-commands.md'
+        anchors: {'esql-source-commands'}
+      - to: 'reference/query-languages/esql/commands/processing-commands.md'
+        anchors: {'esql-processing-commands'}
+
+  'reference/query-languages/esql/commands/processing-commands.md':
+    to: 'reference/query-languages/esql/commands/processing-commands.md'
+    anchors: {} # pass-through unlisted anchors in the `many` ruleset
+    many:
+      - to: 'reference/query-languages/esql/commands/change-point.md'
+        anchors: {'esql-change_point'}
+      - to: 'reference/query-languages/esql/commands/completion.md'
+        anchors: {'esql-completion'}
+      - to: 'reference/query-languages/esql/commands/dissect.md'
+        anchors: {'esql-dissect'}
+      - to: 'reference/query-languages/esql/commands/drop.md'
+        anchors: {'esql-drop'}
+      - to: 'reference/query-languages/esql/commands/enrich.md'
+        anchors: {'esql-enrich'}
+      - to: 'reference/query-languages/esql/commands/eval.md'
+        anchors: {'esql-eval'}
+      - to: 'reference/query-languages/esql/commands/fork.md'
+        anchors: {'esql-fork'}
+      - to: 'reference/query-languages/esql/commands/grok.md'
+        anchors: {'esql-grok'}
+      - to: 'reference/query-languages/esql/commands/keep.md'
+        anchors: {'esql-keep'}
+      - to: 'reference/query-languages/esql/commands/limit.md'
+        anchors: {'esql-limit'}
+      - to: 'reference/query-languages/esql/commands/lookup-join.md'
+        anchors: {'esql-lookup-join'}
+      - to: 'reference/query-languages/esql/commands/mv_expand.md'
+        anchors: {'esql-mv_expand'}
+      - to: 'reference/query-languages/esql/commands/rename.md'
+        anchors: {'esql-rename'}
+      - to: 'reference/query-languages/esql/commands/sample.md'
+        anchors: {'esql-sample'}
+      - to: 'reference/query-languages/esql/commands/sort.md'
+        anchors: {'esql-sort'}
+      - to: 'reference/query-languages/esql/commands/stats-by.md'
+        anchors: {'esql-stats-by'}
+      - to: 'reference/query-languages/esql/commands/where.md'
+        anchors: {'esql-where'}
diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/change_point.md b/docs/reference/query-languages/esql/_snippets/commands/layout/change_point.md
@@ -1,14 +1,12 @@
-## `CHANGE_POINT` [esql-change_point]
-
-:::{note}
-The `CHANGE_POINT` command requires a [platinum license](https://www.elastic.co/subscriptions).
-:::
-
 ```yaml {applies_to}
 serverless: preview
 stack: preview 9.1.0
 ```
 
+:::{note}
+The `CHANGE_POINT` command requires a [platinum license](https://www.elastic.co/subscriptions).
+:::
+
 `CHANGE_POINT` detects spikes, dips, and change points in a metric.
 
 **Syntax**

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/completion.md b/docs/reference/query-languages/esql/_snippets/commands/layout/completion.md
@@ -1,4 +1,3 @@
-## `COMPLETION` [esql-completion]
 
 ```yaml {applies_to}
 serverless: preview

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/dissect.md b/docs/reference/query-languages/esql/_snippets/commands/layout/dissect.md
@@ -1,4 +1,7 @@
-## `DISSECT` [esql-dissect]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 `DISSECT` enables you to [extract structured data out of a string](/reference/query-languages/esql/esql-process-data-with-dissect-grok.md).
 

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/drop.md b/docs/reference/query-languages/esql/_snippets/commands/layout/drop.md
@@ -1,4 +1,7 @@
-## `DROP` [esql-drop]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `DROP` processing command removes one or more columns.
 

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/enrich.md b/docs/reference/query-languages/esql/_snippets/commands/layout/enrich.md
@@ -1,4 +1,7 @@
-## `ENRICH` [esql-enrich]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 `ENRICH` enables you to add data from existing indices as new columns using an
 enrich policy.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/eval.md b/docs/reference/query-languages/esql/_snippets/commands/layout/eval.md
@@ -1,4 +1,7 @@
-## `EVAL` [esql-eval]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `EVAL` processing command enables you to append new columns with calculated
 values.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/fork.md b/docs/reference/query-languages/esql/_snippets/commands/layout/fork.md
@@ -1,5 +1,3 @@
-## `FORK` [esql-fork]
-
 ```yaml {applies_to}
 serverless: preview
 stack: preview 9.1.0

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/from.md b/docs/reference/query-languages/esql/_snippets/commands/layout/from.md
@@ -1,4 +1,7 @@
-## `FROM` [esql-from]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `FROM` source command returns a table with data from a data stream, index,
 or alias.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/grok.md b/docs/reference/query-languages/esql/_snippets/commands/layout/grok.md
@@ -1,4 +1,7 @@
-## `GROK` [esql-grok]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 `GROK` enables you to [extract structured data out of a string](/reference/query-languages/esql/esql-process-data-with-dissect-grok.md).
 

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/keep.md b/docs/reference/query-languages/esql/_snippets/commands/layout/keep.md
@@ -1,4 +1,7 @@
-## `KEEP` [esql-keep]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `KEEP` processing command enables you to specify what columns are returned
 and the order in which they are returned.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/limit.md b/docs/reference/query-languages/esql/_snippets/commands/layout/limit.md
@@ -1,4 +1,7 @@
-## `LIMIT` [esql-limit]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `LIMIT` processing command enables you to limit the number of rows that are
 returned.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/lookup-join.md b/docs/reference/query-languages/esql/_snippets/commands/layout/lookup-join.md
@@ -1,5 +1,3 @@
-## `LOOKUP JOIN` [esql-lookup-join]
-
 ```yaml {applies_to}
 stack: preview 9.0.0, ga 9.1.0
 ```

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/mv_expand.md b/docs/reference/query-languages/esql/_snippets/commands/layout/mv_expand.md
@@ -1,12 +1,7 @@
-## `MV_EXPAND` [esql-mv_expand]
-
-::::{warning}
-This functionality is in technical preview and may be
-changed or removed in a future release. Elastic will work to fix any
-issues, but features in technical preview are not subject to the support
-SLA of official GA features.
-::::
-
+```yaml {applies_to}
+serverless: preview
+stack: preview
+```
 
 The `MV_EXPAND` processing command expands multivalued columns into one row per
 value, duplicating other columns.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/rename.md b/docs/reference/query-languages/esql/_snippets/commands/layout/rename.md
@@ -1,4 +1,7 @@
-## `RENAME` [esql-rename]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `RENAME` processing command renames one or more columns.
 

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/row.md b/docs/reference/query-languages/esql/_snippets/commands/layout/row.md
@@ -1,4 +1,7 @@
-## `ROW` [esql-row]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `ROW` source command produces a row with one or more columns with values
 that you specify. This can be useful for testing.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/sample.md b/docs/reference/query-languages/esql/_snippets/commands/layout/sample.md
@@ -1,5 +1,3 @@
-## `SAMPLE` [esql-sample]
-
 ```yaml {applies_to}
 serverless: preview
 stack: preview 9.1.0

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/show.md b/docs/reference/query-languages/esql/_snippets/commands/layout/show.md
@@ -1,4 +1,7 @@
-## `SHOW` [esql-show]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `SHOW` source command returns information about the deployment and
 its capabilities.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/sort.md b/docs/reference/query-languages/esql/_snippets/commands/layout/sort.md
@@ -1,4 +1,7 @@
-## `SORT` [esql-sort]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `SORT` processing command sorts a table on one or more columns.
 

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/stats-by.md b/docs/reference/query-languages/esql/_snippets/commands/layout/stats-by.md
@@ -1,4 +1,7 @@
-## `STATS` [esql-stats-by]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `STATS` processing command groups rows according to a common value
 and calculates one or more aggregated values over the grouped rows.

diff --git a/docs/reference/query-languages/esql/_snippets/commands/layout/where.md b/docs/reference/query-languages/esql/_snippets/commands/layout/where.md
@@ -1,4 +1,7 @@
-## `WHERE` [esql-where]
+```yaml {applies_to}
+serverless: ga
+stack: ga
+```
 
 The `WHERE` processing command produces a table that contains all the rows from
 the input table for which the provided condition evaluates to `true`.

diff --git a/docs/reference/query-languages/esql/_snippets/common/result-set-size-limitation.md b/docs/reference/query-languages/esql/_snippets/common/result-set-size-limitation.md
@@ -11,8 +11,8 @@ Queries do not return more than 10,000 rows, regardless of the `LIMIT` command
 
 To overcome this limitation:
 
-* Reduce the result set size by modifying the query to only return relevant data. Use [`WHERE`](/reference/query-languages/esql/commands/processing-commands.md#esql-where) to select a smaller subset of the data.
-* Shift any post-query processing to the query itself. You can use the {{esql}} [`STATS`](/reference/query-languages/esql/commands/processing-commands.md#esql-stats-by) command to aggregate data in the query.
+* Reduce the result set size by modifying the query to only return relevant data. Use [`WHERE`](/reference/query-languages/esql/commands/where.md) to select a smaller subset of the data.
+* Shift any post-query processing to the query itself. You can use the {{esql}} [`STATS`](/reference/query-languages/esql/commands/stats-by.md) command to aggregate data in the query.
 
 The upper limit only applies to the number of rows that are output by the query, not to the number of documents it processes: the query runs on the full data set.
 

diff --git a/docs/reference/query-languages/esql/_snippets/functions/examples/bucket.md b/docs/reference/query-languages/esql/_snippets/functions/examples/bucket.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/examples/count.md b/docs/reference/query-languages/esql/_snippets/functions/examples/count.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/examples/date_trunc.md b/docs/reference/query-languages/esql/_snippets/functions/examples/date_trunc.md
diff --git a/docs/reference/query-languages/esql/_snippets/lists/processing-commands.md b/docs/reference/query-languages/esql/_snippets/lists/processing-commands.md
@@ -1,17 +1,17 @@
-* [preview] [`CHANGE_POINT`](../../commands/processing-commands.md#esql-change_point)
-* [preview] [`COMPLETION`](../../commands/processing-commands.md#esql-completion)
-* [`DISSECT`](../../commands/processing-commands.md#esql-dissect)
-* [`DROP`](../../commands/processing-commands.md#esql-drop)
-* [`ENRICH`](../../commands/processing-commands.md#esql-enrich)
-* [`EVAL`](../../commands/processing-commands.md#esql-eval)
-* [`GROK`](../../commands/processing-commands.md#esql-grok)
-* [preview] [`FORK`](../../commands/processing-commands.md#esql-fork)
-* [`KEEP`](../../commands/processing-commands.md#esql-keep)
-* [`LIMIT`](../../commands/processing-commands.md#esql-limit)
-* [`LOOKUP JOIN`](../../commands/processing-commands.md#esql-lookup-join)
-* [preview] [`MV_EXPAND`](../../commands/processing-commands.md#esql-mv_expand)
-* [`RENAME`](../../commands/processing-commands.md#esql-rename)
-* [preview] [`SAMPLE`](../../commands/processing-commands.md#esql-sample)
-* [`SORT`](../../commands/processing-commands.md#esql-sort)
-* [`STATS`](../../commands/processing-commands.md#esql-stats-by)
-* [`WHERE`](../../commands/processing-commands.md#esql-where)
+* [preview] [`CHANGE_POINT`](/reference/query-languages/esql/commands/change-point.md)
+* [preview] [`COMPLETION`](/reference/query-languages/esql/commands/completion.md)
+* [`DISSECT`](/reference/query-languages/esql/commands/dissect.md)
+* [`DROP`](/reference/query-languages/esql/commands/drop.md)
+* [`ENRICH`](/reference/query-languages/esql/commands/enrich.md)
+* [`EVAL`](/reference/query-languages/esql/commands/eval.md)
+* [`GROK`](/reference/query-languages/esql/commands/grok.md)
+* [preview] [`FORK`](/reference/query-languages/esql/commands/fork.md)
+* [`KEEP`](/reference/query-languages/esql/commands/keep.md)
+* [`LIMIT`](/reference/query-languages/esql/commands/limit.md)
+* [`LOOKUP JOIN`](/reference/query-languages/esql/commands/lookup-join.md)
+* [preview] [`MV_EXPAND`](/reference/query-languages/esql/commands/mv_expand.md)
+* [`RENAME`](/reference/query-languages/esql/commands/rename.md)
+* [preview] [`SAMPLE`](/reference/query-languages/esql/commands/sample.md)
+* [`SORT`](/reference/query-languages/esql/commands/sort.md)
+* [`STATS`](/reference/query-languages/esql/commands/stats-by.md)
+* [`WHERE`](/reference/query-languages/esql/commands/where.md)
diff --git a/docs/reference/query-languages/esql/_snippets/lists/source-commands.md b/docs/reference/query-languages/esql/_snippets/lists/source-commands.md
@@ -1,3 +1,3 @@
-* [`FROM`](../../commands/source-commands.md#esql-from)
-* [`ROW`](../../commands/source-commands.md#esql-row)
-* [`SHOW`](../../commands/source-commands.md#esql-show)
+- [`FROM`](/reference/query-languages/esql/commands/from.md)
+- [`ROW`](/reference/query-languages/esql/commands/row.md)
+- [`SHOW`](/reference/query-languages/esql/commands/show.md)
diff --git a/docs/reference/query-languages/esql/commands/change-point.md b/docs/reference/query-languages/esql/commands/change-point.md
@@ -0,0 +1,10 @@
+---
+navigation_title: "CHANGE_POINT"
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-commands.html#esql-change_point
+---
+
+# `CHANGE_POINT` [esql-change_point]
+
+:::{include} ../_snippets/commands/layout/change_point.md
+:::
diff --git a/docs/reference/query-languages/esql/commands/completion.md b/docs/reference/query-languages/esql/commands/completion.md
@@ -0,0 +1,10 @@
+---
+navigation_title: "COMPLETION"
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-commands.html#esql-completion
+---
+
+# `COMPLETION` [esql-completion]
+
+:::{include} ../_snippets/commands/layout/completion.md
+:::
diff --git a/docs/reference/query-languages/esql/commands/dissect.md b/docs/reference/query-languages/esql/commands/dissect.md
@@ -0,0 +1,10 @@
+---
+navigation_title: "DISSECT"
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-commands.html#esql-dissect
+---
+
+# `DISSECT` [esql-dissect]
+
+:::{include} ../_snippets/commands/layout/dissect.md
+:::
diff --git a/docs/reference/query-languages/esql/commands/drop.md b/docs/reference/query-languages/esql/commands/drop.md
@@ -0,0 +1,10 @@
+---
+navigation_title: "DROP"
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-commands.html#esql-drop
+---
+
+# `DROP` [esql-drop]
+
+:::{include} ../_snippets/commands/layout/drop.md
+:::
diff --git a/docs/reference/query-languages/esql/commands/enrich.md b/docs/reference/query-languages/esql/commands/enrich.md
@@ -0,0 +1,10 @@
+---
+navigation_title: "ENRICH"
+mapped_pages:
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-commands.html#esql-enrich
+---
+
+# `ENRICH` [esql-enrich]
+
+:::{include} ../_snippets/commands/layout/enrich.md
+:::