add body back

ersin-erdal · ersin-erdal · commit 478e5659400d · 2025-04-15T14:41:58.000+02:00
diff --git a/x-pack/platform/plugins/shared/alerting/server/alerts_service/lib/create_or_update_index_template.test.ts b/x-pack/platform/plugins/shared/alerting/server/alerts_service/lib/create_or_update_index_template.test.ts
@@ -16,43 +16,45 @@ const clusterClient = elasticsearchServiceMock.createClusterClient().asInternalU
 
 const IndexTemplate = (namespace = 'default', useDataStream = false) => ({
   name: `.alerts-test.alerts-${namespace}-index-template`,
-  _meta: {
-    kibana: {
-      version: '8.6.1',
+  body: {
+    _meta: {
+      kibana: {
+        version: '8.6.1',
+      },
+      managed: true,
+      namespace,
     },
-    managed: true,
-    namespace,
-  },
-  composed_of: ['mappings1', 'framework-mappings'],
-  index_patterns: [`.internal.alerts-test.alerts-${namespace}-*`],
-  template: {
-    mappings: {
-      _meta: {
-        kibana: {
-          version: '8.6.1',
+    composed_of: ['mappings1', 'framework-mappings'],
+    index_patterns: [`.internal.alerts-test.alerts-${namespace}-*`],
+    template: {
+      mappings: {
+        _meta: {
+          kibana: {
+            version: '8.6.1',
+          },
+          managed: true,
+          namespace,
         },
-        managed: true,
-        namespace,
+        dynamic: false,
+      },
+      settings: {
+        auto_expand_replicas: '0-1',
+        hidden: true,
+        ...(useDataStream
+          ? {}
+          : {
+              'index.lifecycle': {
+                name: 'test-ilm-policy',
+                rollover_alias: `.alerts-test.alerts-${namespace}`,
+              },
+            }),
+        'index.mapping.ignore_malformed': true,
+        'index.mapping.total_fields.ignore_dynamic_beyond_limit': true,
+        'index.mapping.total_fields.limit': 2500,
       },
-      dynamic: false,
-    },
-    settings: {
-      auto_expand_replicas: '0-1',
-      hidden: true,
-      ...(useDataStream
-        ? {}
-        : {
-            'index.lifecycle': {
-              name: 'test-ilm-policy',
-              rollover_alias: `.alerts-test.alerts-${namespace}`,
-            },
-          }),
-      'index.mapping.ignore_malformed': true,
-      'index.mapping.total_fields.ignore_dynamic_beyond_limit': true,
-      'index.mapping.total_fields.limit': 2500,
     },
+    priority: namespace.length,
   },
-  priority: namespace.length,
 });
 
 const SimulateTemplateResponse = {
diff --git a/x-pack/platform/plugins/shared/alerting/server/alerts_service/lib/create_or_update_index_template.ts b/x-pack/platform/plugins/shared/alerting/server/alerts_service/lib/create_or_update_index_template.ts
@@ -57,40 +57,43 @@ export const getIndexTemplate = ({
 
   return {
     name: indexPatterns.template,
-    ...(dataStreamFields.data_stream ? { data_stream: dataStreamFields.data_stream } : {}),
-    index_patterns: dataStreamFields.index_patterns,
-    composed_of: componentTemplateRefs,
-    template: {
-      settings: {
-        auto_expand_replicas: '0-1',
-        hidden: true,
-        ...(dataStreamAdapter.isUsingDataStreams()
-          ? {}
-          : {
-              'index.lifecycle': indexLifecycle,
-            }),
-        'index.mapping.ignore_malformed': true,
-        'index.mapping.total_fields.limit': totalFieldsLimit,
-        'index.mapping.total_fields.ignore_dynamic_beyond_limit': true,
-      },
-      mappings: {
-        dynamic: false,
-        _meta: indexMetadata,
-      },
-      ...(indexPatterns.secondaryAlias
-        ? {
-            aliases: {
-              [indexPatterns.secondaryAlias]: {
-                is_write_index: false,
+    body: {
+      ...(dataStreamFields.data_stream ? { data_stream: dataStreamFields.data_stream } : {}),
+      index_patterns: dataStreamFields.index_patterns,
+      composed_of: componentTemplateRefs,
+      template: {
+        settings: {
+          auto_expand_replicas: '0-1',
+          hidden: true,
+          ...(dataStreamAdapter.isUsingDataStreams()
+            ? {}
+            : {
+                'index.lifecycle': indexLifecycle,
+              }),
+          'index.mapping.ignore_malformed': true,
+          'index.mapping.total_fields.limit': totalFieldsLimit,
+          'index.mapping.total_fields.ignore_dynamic_beyond_limit': true,
+        },
+        mappings: {
+          dynamic: false,
+          _meta: indexMetadata,
+        },
+        ...(indexPatterns.secondaryAlias
+          ? {
+              aliases: {
+                [indexPatterns.secondaryAlias]: {
+                  is_write_index: false,
+                },
               },
-            },
-          }
-        : {}),
+            }
+          : {}),
+      },
+      _meta: indexMetadata,
+
+      // By setting the priority to namespace.length, we ensure that if one namespace is a prefix of another namespace
+      // then newly created indices will use the matching template with the *longest* namespace
+      priority: namespace.length,
     },
-    _meta: indexMetadata,
-    // By setting the priority to namespace.length, we ensure that if one namespace is a prefix of another namespace
-    // then newly created indices will use the matching template with the *longest* namespace
-    priority: namespace.length,
   };
 };
 
