Revert "Use deprecated _source mode mapping attribute instead"

This reverts commit 808b587.
elastic · Oct 21, 2024 · 38ce118 · 38ce118
1 parent 808b587
commit 38ce118
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/elastic/logs/templates/component/track-shared-logsdb-mode.json b/elastic/logs/templates/component/track-shared-logsdb-mode.json
@@ -12,13 +12,6 @@
             {% endif %}
         }
         {% endif %}
-      },
-      "mappings": {
-        {% if source_mode %}
-        "_source": {
-          "mapping.source.mode": {{ source_mode | tojson }}
-        }
-        {% endif %}
       }
     }
   }
diff --git a/elastic/security/templates/component/track-shared-logsdb-mode.json b/elastic/security/templates/component/track-shared-logsdb-mode.json
@@ -7,18 +7,14 @@
             {% if synthetic_source_keep and synthetic_source_keep != 'none' %}
             "mapping.synthetic_source_keep": {{ synthetic_source_keep | tojson}},
             {% endif %}
+            {% if source_mode %}
+            "mapping.source.mode": {{ source_mode | tojson }},
+            {% endif %}
             "sort.field": [ "host.id", "@timestamp" ],
             "sort.order": [ "asc", "desc" ],
             "sort.missing": ["_first", "_last"]
         }
         {% endif %}
-      },
-      "mappings": {
-        {% if source_mode %}
-        "_source": {
-          "mapping.source.mode": {{ source_mode | tojson }}
-        }
-        {% endif %}
       }
     }
   }
diff --git a/http_logs/index.json b/http_logs/index.json
@@ -10,6 +10,9 @@
     {% if synthetic_source_keep %}
     "index.mapping.synthetic_source_keep": "{{synthetic_source_keep}}",
     {% endif %}
+    {% if source_mode %}
+    "index.mapping.source.mode": {{ source_mode | tojson }},
+    {% endif %}
     "index.sort.field": ["@timestamp"],
     "index.sort.order":["desc"]
     {%- endif %}
@@ -20,9 +23,6 @@
     {%- else %}
     "_source": {
       "enabled": {{ source_enabled | default(true) | tojson }}
-      {% if source_mode %}
-      "mode": {{ source_mode | tojson }},
-      {% endif %}
     },
     {%- endif %}
     "properties": {