From 2eab36ef08dbd15c1c3c49e43a6b4f6a0b0a2303 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:19:04 -0700
Subject: [PATCH] [Backport 8.x] Add x-model overlays for tokenizer, filter,
 charfilter schemas (#3021)

---
 .../elasticsearch-shared-overlays.yaml        | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/docs/overlays/elasticsearch-shared-overlays.yaml b/docs/overlays/elasticsearch-shared-overlays.yaml
index ad75583fb8..466da366e8 100644
--- a/docs/overlays/elasticsearch-shared-overlays.yaml
+++ b/docs/overlays/elasticsearch-shared-overlays.yaml
@@ -143,19 +143,19 @@ actions:
           x-displayName: Machine learning anomaly detection
           # description:
           externalDocs:
-            url: https://www.elastic.co/guide/en/machine-learning/master/ml-ad-finding-anomalies.html
+            url: https://www.elastic.co/guide/en/machine-learning/current/ml-ad-finding-anomalies.html
             description: Finding anomalies
         - name: ml data frame
           x-displayName: Machine learning data frame analytics
           # description:
           externalDocs:
-            url: https://www.elastic.co/guide/en/machine-learning/master/ml-dfa-overview.html
+            url: https://www.elastic.co/guide/en/machine-learning/current/ml-dfa-overview.html
             description: Data frame analytics overview
         - name: ml trained model
           x-displayName: Machine learning trained model
           # description:
           externalDocs:
-            url: https://www.elastic.co/guide/en/machine-learning/master/ml-nlp-overview.html
+            url: https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-overview.html
             description: Natural language processing overview
         - name: migration
           x-displayName: Migration
@@ -243,6 +243,43 @@ actions:
       # W
         - name: watcher
           x-displayName: Watcher
+# Add x-model and/or abbreviate schemas that should point to other references
+  - target: "$.components['schemas']['_types.analysis:CharFilter'].oneOf"
+    description: Remove existing oneOf definition for CharFilter
+    remove: true
+  - target: "$.components['schemas']['_types.analysis:CharFilter']"
+    description: Simplify CharFilter definition
+    update:
+      x-model: true
+      description: >
+        Character filters that are used to preprocess characters before they are passed to the tokenizer.
+      externalDocs:
+        url: https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-charfilters.html
+        description: Character filters reference
+  - target: "$.components['schemas']['_types.analysis:Tokenizer'].oneOf"
+    description: Remove existing oneOf definition for tokenizer
+    remove: true
+  - target: "$.components['schemas']['_types.analysis:Tokenizer']"
+    description: Simplify tokenizer definition
+    update:
+      x-model: true
+      description: >
+        A tokenizer to use to convert text into tokens.
+      externalDocs:
+        url: https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-tokenizers.html
+        description: Tokenizer reference
+  - target: "$.components['schemas']['_types.analysis:TokenFilter'].oneOf"
+    description: Remove existing oneOf definition for tokenfilter
+    remove: true
+  - target: "$.components['schemas']['_types.analysis:TokenFilter']"
+    description: Simplify tokenfilter definition
+    update:
+      x-model: true
+      description: >
+        Token filters that are applied after the tokenizer.
+      externalDocs:
+        url: https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-tokenfilters.html
+        description: Token filter reference
 # Abbreviate and annotate items that are not shown in Bump.sh due to depth limits
   - target: "$.components['schemas']['ml._types:Datafeed'].properties.query"
     description: Remove query object from anomaly detection datafeed