Remove deprecated argument include_type_name from ES calls (#50285)

This PR is merged with an error, because these errors happen on master as well. @flash1293 is working on fixing those. This one should allow us running with the latest es snapshot * deprecate include_type_name * include_type_name * remove doc from mappings * Updated timelion mapping * Updated spaces and uptime mapping * monitoring apm mapping * Updated more mappings * 2 more mappings * Updated reporting mappings after syncing with @gammon * Removed deprecated setting
elastic · Nov 12, 2019 · 19f7e99 · 19f7e99
1 parent aa63889
commit 19f7e99
Show file tree

Hide file tree

Showing 45 changed files with 72,504 additions and 44,450 deletions.
diff --git a/src/es_archiver/lib/indices/__tests__/create_index_stream.js b/src/es_archiver/lib/indices/__tests__/create_index_stream.js
@@ -113,7 +113,6 @@ describe('esArchiver: createCreateIndexStream()', () => {
       sinon.assert.calledWith(client.indices.create, {
         method: 'PUT',
         index: 'index',
-        include_type_name: false,
         body: {
           settings: undefined,
           mappings: undefined,

diff --git a/src/es_archiver/lib/indices/create_index_stream.js b/src/es_archiver/lib/indices/create_index_stream.js
@@ -41,9 +41,6 @@ export function createCreateIndexStream({ client, stats, skipExisting, log }) {
 
   async function handleIndex(record) {
     const { index, settings, mappings, aliases } = record.value;
-
-    // Determine if the mapping belongs to a pre-7.0 instance, for BWC tests, mainly
-    const isPre7Mapping = !!mappings && Object.keys(mappings).length > 0 && !mappings.properties;
     const isKibana = index.startsWith('.kibana');
 
     async function attemptToCreate(attemptNumber = 1) {
@@ -55,7 +52,6 @@ export function createCreateIndexStream({ client, stats, skipExisting, log }) {
         await client.indices.create({
           method: 'PUT',
           index,
-          include_type_name: isPre7Mapping,
           body: {
             settings,
             mappings,

diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.create.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.create.json
@@ -1,7 +1,6 @@
 {
   "indices.create": {
     "url_params": {
-      "include_type_name": "__flag__",
       "wait_for_active_shards": "",
       "timeout": "",
       "master_timeout": ""

diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get.json
@@ -1,7 +1,6 @@
 {
   "indices.get": {
     "url_params": {
-      "include_type_name": "__flag__",
       "local": "__flag__",
       "ignore_unavailable": "__flag__",
       "allow_no_indices": "__flag__",

diff --git a/...gacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json b/...gacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json
@@ -1,7 +1,6 @@
 {
   "indices.get_field_mapping": {
     "url_params": {
-      "include_type_name": "__flag__",
       "include_defaults": "__flag__",
       "ignore_unavailable": "__flag__",
       "allow_no_indices": "__flag__",

diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_template.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_template.json
@@ -1,7 +1,6 @@
 {
   "indices.get_template": {
     "url_params": {
-      "include_type_name": "__flag__",
       "flat_settings": "__flag__",
       "master_timeout": "",
       "local": "__flag__"

diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_template.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_template.json
@@ -1,7 +1,6 @@
 {
   "indices.put_template": {
     "url_params": {
-      "include_type_name": "__flag__",
       "order": "",
       "create": "__flag__",
       "timeout": "",

diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.rollover.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.rollover.json
@@ -1,7 +1,6 @@
 {
   "indices.rollover": {
     "url_params": {
-      "include_type_name": "__flag__",
       "timeout": "",
       "dry_run": "__flag__",
       "master_timeout": "",

diff --git a/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts b/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
@@ -231,7 +231,7 @@ export const reindexActionsFactory = (
 
     async getFlatSettings(indexName: string) {
       const flatSettings = (await callCluster('transport.request', {
-        path: `/${encodeURIComponent(indexName)}?flat_settings=true&include_type_name=false`,
+        path: `/${encodeURIComponent(indexName)}?flat_settings=true`,
       })) as { [indexName: string]: FlatSettings };
 
       if (!flatSettings[indexName]) {

diff --git a/x-pack/test/api_integration/apis/management/index_management/settings.js b/x-pack/test/api_integration/apis/management/index_management/settings.js
@@ -37,7 +37,6 @@ export default function ({ getService }) {
         'max_terms_count',
         'lifecycle',
         'routing_partition_size',
-        'force_memory_term_dictionary',
         'max_docvalue_fields_search',
         'merge',
         'max_refresh_listeners',