Merge branch 'test-8.0-fixes' into no-include_type_name

elastic · Jan 14, 2022 · c4ffe3a · c4ffe3a
2 parents bac827e + 5f16a8a
commit c4ffe3a
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 15 deletions.
diff --git a/packages/kbn-es-archiver/src/actions/load.ts b/packages/kbn-es-archiver/src/actions/load.ts
@@ -85,15 +85,17 @@ export async function loadAction({
   progress.deactivate();
   const result = stats.toJSON();
 
+  const indicesWithDocs: string[] = [];
   for (const [index, { docs }] of Object.entries(result)) {
     if (docs && docs.indexed > 0) {
       log.info('[%s] Indexed %d docs into %j', name, docs.indexed, index);
+      indicesWithDocs.push(index);
     }
   }
 
   await client.indices.refresh(
     {
-      index: '_all',
+      index: indicesWithDocs.join(','),
       allow_no_indices: true,
     },
     {

diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -158,7 +158,6 @@ export async function createDefaultSpace({
   await client.create(
     {
       index,
-      type: '_doc',
       id: 'space:default',
       refresh: 'wait_for',
       body: {

diff --git a/.../functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json b/.../functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json
@@ -165,8 +165,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"
@@ -418,4 +417,4 @@
       }
     }
   }
-}
+}
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json
@@ -196,8 +196,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"

diff --git a/...functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json b/...functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json
@@ -179,8 +179,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"

diff --git a/x-pack/test/functional/es_archives/lens/basic/mappings.json b/x-pack/test/functional/es_archives/lens/basic/mappings.json
@@ -309,7 +309,6 @@
         "gis-map": {
           "properties": {
             "bounds": {
-              "strategy": "recursive",
               "type": "geo_shape"
             },
             "description": {

diff --git a/x-pack/test/functional/es_archives/lens/reporting/mappings.json b/x-pack/test/functional/es_archives/lens/reporting/mappings.json
@@ -309,7 +309,6 @@
         "gis-map": {
           "properties": {
             "bounds": {
-              "strategy": "recursive",
               "type": "geo_shape"
             },
             "description": {

diff --git a/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json b/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json
@@ -309,7 +309,6 @@
         "gis-map": {
           "properties": {
             "bounds": {
-              "strategy": "recursive",
               "type": "geo_shape"
             },
             "description": {

diff --git a/x-pack/test/functional/es_archives/maps/kibana/mappings.json b/x-pack/test/functional/es_archives/maps/kibana/mappings.json
@@ -181,7 +181,6 @@
         "map": {
           "properties": {
             "bounds": {
-              "tree": "quadtree",
               "type": "geo_shape"
             },
             "description": {

diff --git a/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json b/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json
@@ -165,8 +165,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"