[migrations] Fetch additional mappings with types

Follow-up to #28497 Since elastic/elasticsearch#37285 has been merged, it's aparent there are a couple more places we need to specify include_type_name as a stop-gap until #23650 is completed Signed-off-by: Tyler Smalley <[email protected]>
elastic · Jan 15, 2019 · 90dede6 · 90dede6
1 parent 77a349b
commit 90dede6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/server/saved_objects/migrations/core/call_cluster.ts b/src/server/saved_objects/migrations/core/call_cluster.ts
@@ -67,6 +67,7 @@ export interface PutMappingOpts {
   body: DocMapping;
   index: string;
   type: string;
+  include_type_name?: boolean;
 }
 
 export interface PutTemplateOpts {
@@ -87,6 +88,7 @@ export interface IndexOpts {
 
 export interface IndexCreationOpts {
   index: string;
+  include_type_name?: boolean;
   body?: {
     mappings?: IndexMapping;
     settings?: {

diff --git a/src/server/saved_objects/migrations/core/elastic_index.ts b/src/server/saved_objects/migrations/core/elastic_index.ts
@@ -222,15 +222,24 @@ export async function migrationsUpToDate(
  * @param {IndexMapping} mappings
  */
 export function putMappings(callCluster: CallCluster, index: string, mappings: IndexMapping) {
-  return callCluster('indices.putMapping', { body: mappings.doc, index, type: ROOT_TYPE });
+  return callCluster('indices.putMapping', {
+    body: mappings.doc,
+    index,
+    type: ROOT_TYPE,
+    include_type_name: true,
+  });
 }
 
 export async function createIndex(
   callCluster: CallCluster,
   index: string,
   mappings?: IndexMapping
 ) {
-  await callCluster('indices.create', { body: { mappings, settings }, index });
+  await callCluster('indices.create', {
+    body: { mappings, settings },
+    index,
+    include_type_name: true,
+  });
 }
 
 export async function deleteIndex(callCluster: CallCluster, index: string) {

diff --git a/src/server/saved_objects/service/create_saved_objects_service.js b/src/server/saved_objects/service/create_saved_objects_service.js
@@ -38,6 +38,7 @@ export function createSavedObjectsService(server, schema, serializer, migrator)
       const index = server.config().get('kibana.index');
       await adminCluster.callWithInternalUser('indices.putTemplate', {
         name: `kibana_index_template:${index}`,
+        include_type_name: true,
         body: {
           template: index,
           settings: {