Skip to content

Remove deprecated argument include_type_name from ES calls #50285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 12, 2019
Merged

Remove deprecated argument include_type_name from ES calls #50285

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8a1003d
deprecate include_type_name
Nov 12, 2019
9b1c3fe
include_type_name
Nov 12, 2019
aff2393
remove doc from mappings
Nov 12, 2019
d7cd41f
Updated timelion mapping
Nov 12, 2019
eea2096
Updated spaces and uptime mapping
Nov 12, 2019
9a8cd6c
monitoring apm mapping
Nov 12, 2019
99256b5
Updated more mappings
Nov 12, 2019
863e25f
2 more mappings
Nov 12, 2019
f936f95
Updated reporting mappings after syncing with @gammon
Nov 12, 2019
1d76534
Merge remote-tracking branch 'upstream/master' into deprecate/remove-…
Nov 12, 2019
5412be3
Removed deprecated setting
Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/es_archiver/lib/indices/__tests__/create_index_stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 8 additions & 3 deletions src/es_archiver/lib/indices/create_index_stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,21 @@ export function createCreateIndexStream({ client, stats, skipExisting, log }) {
await deleteKibanaIndicesOnce({ client, stats, log });
}

await client.indices.create({
const createArgs = {
method: 'PUT',
index,
include_type_name: isPre7Mapping,
body: {
settings,
mappings,
aliases
},
});
};

if (isPre7Mapping) {
createArgs.include_type_name = isPre7Mapping;
}

await client.indices.create(createArgs);

stats.createdIndex(index, { settings });
} catch (err) {
Expand Down
1 change: 0 additions & 1 deletion src/legacy/core_plugins/console/server/api_server/spec/generated/indices.create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.create": {
"url_params": {
"include_type_name": "__flag__",
"wait_for_active_shards": "",
"timeout": "",
"master_timeout": ""
Expand Down
1 change: 0 additions & 1 deletion src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.get": {
"url_params": {
"include_type_name": "__flag__",
"local": "__flag__",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
Expand Down
1 change: 0 additions & 1 deletion ...gacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.get_field_mapping": {
"url_params": {
"include_type_name": "__flag__",
"include_defaults": "__flag__",
"ignore_unavailable": "__flag__",
"allow_no_indices": "__flag__",
Expand Down
1 change: 0 additions & 1 deletion src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.get_template": {
"url_params": {
"include_type_name": "__flag__",
"flat_settings": "__flag__",
"master_timeout": "",
"local": "__flag__"
Expand Down
1 change: 0 additions & 1 deletion src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.put_template": {
"url_params": {
"include_type_name": "__flag__",
"order": "",
"create": "__flag__",
"timeout": "",
Expand Down
1 change: 0 additions & 1 deletion src/legacy/core_plugins/console/server/api_server/spec/generated/indices.rollover.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"indices.rollover": {
"url_params": {
"include_type_name": "__flag__",
"timeout": "",
"dry_run": "__flag__",
"master_timeout": "",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]) {
Expand Down