Skip to content

Commit 19f7e99

Browse files
author
Liza Katz
authored
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
1 parent aa63889 commit 19f7e99

File tree

45 files changed

+72504
-44450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+72504
-44450
lines changed

src/es_archiver/lib/indices/__tests__/create_index_stream.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ describe('esArchiver: createCreateIndexStream()', () => {
113113
sinon.assert.calledWith(client.indices.create, {
114114
method: 'PUT',
115115
index: 'index',
116-
include_type_name: false,
117116
body: {
118117
settings: undefined,
119118
mappings: undefined,

src/es_archiver/lib/indices/create_index_stream.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ export function createCreateIndexStream({ client, stats, skipExisting, log }) {
4141

4242
async function handleIndex(record) {
4343
const { index, settings, mappings, aliases } = record.value;
44-
45-
// Determine if the mapping belongs to a pre-7.0 instance, for BWC tests, mainly
46-
const isPre7Mapping = !!mappings && Object.keys(mappings).length > 0 && !mappings.properties;
4744
const isKibana = index.startsWith('.kibana');
4845

4946
async function attemptToCreate(attemptNumber = 1) {
@@ -55,7 +52,6 @@ export function createCreateIndexStream({ client, stats, skipExisting, log }) {
5552
await client.indices.create({
5653
method: 'PUT',
5754
index,
58-
include_type_name: isPre7Mapping,
5955
body: {
6056
settings,
6157
mappings,

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.create.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.create": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"wait_for_active_shards": "",
65
"timeout": "",
76
"master_timeout": ""

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.get": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"local": "__flag__",
65
"ignore_unavailable": "__flag__",
76
"allow_no_indices": "__flag__",

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.get_field_mapping": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"include_defaults": "__flag__",
65
"ignore_unavailable": "__flag__",
76
"allow_no_indices": "__flag__",

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_template.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.get_template": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"flat_settings": "__flag__",
65
"master_timeout": "",
76
"local": "__flag__"

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_template.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.put_template": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"order": "",
65
"create": "__flag__",
76
"timeout": "",

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.rollover.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.rollover": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"timeout": "",
65
"dry_run": "__flag__",
76
"master_timeout": "",

x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export const reindexActionsFactory = (
231231

232232
async getFlatSettings(indexName: string) {
233233
const flatSettings = (await callCluster('transport.request', {
234-
path: `/${encodeURIComponent(indexName)}?flat_settings=true&include_type_name=false`,
234+
path: `/${encodeURIComponent(indexName)}?flat_settings=true`,
235235
})) as { [indexName: string]: FlatSettings };
236236

237237
if (!flatSettings[indexName]) {

x-pack/test/api_integration/apis/management/index_management/settings.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export default function ({ getService }) {
3737
'max_terms_count',
3838
'lifecycle',
3939
'routing_partition_size',
40-
'force_memory_term_dictionary',
4140
'max_docvalue_fields_search',
4241
'merge',
4342
'max_refresh_listeners',

0 commit comments

Comments
 (0)