From c3be95b106f7cceae3bafdece35688ecc17c5897 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 26 Apr 2017 10:38:20 -0700 Subject: [PATCH] Sets ES mapping to single_type=false Until we are able to remove our usage of types, we need to disable this breaking change. Signed-off-by: Tyler Smalley --- .../elasticsearch/lib/create_kibana_index.js | 1 + src/fixtures/es_archives/dashboard/mappings.json | 3 ++- src/fixtures/es_archives/discover/mappings.json | 3 ++- src/fixtures/es_archives/empty_kibana/mappings.json | 3 ++- .../es_archives/logstash_functional/mappings.json | 9 ++++++--- src/fixtures/es_archives/makelogs/mappings.json | 6 ++++-- src/fixtures/es_archives/visualize/mappings.json | 3 ++- .../es_archives/visualize_source-filters/mappings.json | 3 ++- .../es_archives/visualize_source_filters/mappings.json | 3 ++- 9 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/core_plugins/elasticsearch/lib/create_kibana_index.js b/src/core_plugins/elasticsearch/lib/create_kibana_index.js index ad759378c3bcf..ddf3514520217 100644 --- a/src/core_plugins/elasticsearch/lib/create_kibana_index.js +++ b/src/core_plugins/elasticsearch/lib/create_kibana_index.js @@ -7,6 +7,7 @@ module.exports = function (server, mappings) { settings: { number_of_shards: 1, 'index.mapper.dynamic': false, + 'index.mapping.single_type': false }, mappings } diff --git a/src/fixtures/es_archives/dashboard/mappings.json b/src/fixtures/es_archives/dashboard/mappings.json index 17d090a72b752..35a1f4a074b91 100644 --- a/src/fixtures/es_archives/dashboard/mappings.json +++ b/src/fixtures/es_archives/dashboard/mappings.json @@ -5,7 +5,8 @@ "settings": { "index": { "number_of_shards": "5", - "number_of_replicas": "1" + "number_of_replicas": "1", + "mapping.single_type": false } }, "mappings": { diff --git a/src/fixtures/es_archives/discover/mappings.json b/src/fixtures/es_archives/discover/mappings.json index f468ba3b723ae..13199962379e8 100644 --- a/src/fixtures/es_archives/discover/mappings.json +++ b/src/fixtures/es_archives/discover/mappings.json @@ -5,7 +5,8 @@ "settings": { "index": { "number_of_shards": "5", - "number_of_replicas": "1" + "number_of_replicas": "1", + "mapping.single_type": false } }, "mappings": { diff --git a/src/fixtures/es_archives/empty_kibana/mappings.json b/src/fixtures/es_archives/empty_kibana/mappings.json index 45867ce97458c..9a0d2bd35fb9d 100644 --- a/src/fixtures/es_archives/empty_kibana/mappings.json +++ b/src/fixtures/es_archives/empty_kibana/mappings.json @@ -5,7 +5,8 @@ "settings": { "index": { "number_of_shards": "1", - "number_of_replicas": "1" + "number_of_replicas": "1", + "mapping.single_type": false } }, "mappings": { diff --git a/src/fixtures/es_archives/logstash_functional/mappings.json b/src/fixtures/es_archives/logstash_functional/mappings.json index 98de7c60931b1..9c1f3f479545b 100644 --- a/src/fixtures/es_archives/logstash_functional/mappings.json +++ b/src/fixtures/es_archives/logstash_functional/mappings.json @@ -14,7 +14,8 @@ } } }, - "number_of_replicas": "0" + "number_of_replicas": "0", + "mapping.single_type": false } }, "mappings": { @@ -792,7 +793,8 @@ } } }, - "number_of_replicas": "0" + "number_of_replicas": "0", + "mapping.single_type": false } }, "mappings": { @@ -1570,7 +1572,8 @@ } } }, - "number_of_replicas": "0" + "number_of_replicas": "0", + "mapping.single_type": false } }, "mappings": { diff --git a/src/fixtures/es_archives/makelogs/mappings.json b/src/fixtures/es_archives/makelogs/mappings.json index 184f9fee47843..691938b3cae66 100644 --- a/src/fixtures/es_archives/makelogs/mappings.json +++ b/src/fixtures/es_archives/makelogs/mappings.json @@ -14,7 +14,8 @@ } } }, - "number_of_replicas": "0" + "number_of_replicas": "0", + "mapping.single_type": false } }, "mappings": { @@ -789,7 +790,8 @@ } } }, - "number_of_replicas": "0" + "number_of_replicas": "0", + "mapping.single_type": false } }, "mappings": { diff --git a/src/fixtures/es_archives/visualize/mappings.json b/src/fixtures/es_archives/visualize/mappings.json index 529183ce6b8ac..746fa60ff04e7 100644 --- a/src/fixtures/es_archives/visualize/mappings.json +++ b/src/fixtures/es_archives/visualize/mappings.json @@ -5,7 +5,8 @@ "settings": { "index": { "number_of_shards": "5", - "number_of_replicas": "1" + "number_of_replicas": "1", + "mapping.single_type": false } }, "mappings": { diff --git a/src/fixtures/es_archives/visualize_source-filters/mappings.json b/src/fixtures/es_archives/visualize_source-filters/mappings.json index 1e13488403693..6e22ac8cce9a9 100644 --- a/src/fixtures/es_archives/visualize_source-filters/mappings.json +++ b/src/fixtures/es_archives/visualize_source-filters/mappings.json @@ -5,7 +5,8 @@ "settings": { "index": { "number_of_shards": "5", - "number_of_replicas": "1" + "number_of_replicas": "1", + "mapping.single_type": false } }, "mappings": { diff --git a/src/fixtures/es_archives/visualize_source_filters/mappings.json b/src/fixtures/es_archives/visualize_source_filters/mappings.json index 02102b49e6339..d4536237f9494 100644 --- a/src/fixtures/es_archives/visualize_source_filters/mappings.json +++ b/src/fixtures/es_archives/visualize_source_filters/mappings.json @@ -5,7 +5,8 @@ "settings": { "index": { "number_of_shards": "1", - "number_of_replicas": "0" + "number_of_replicas": "0", + "mapping.single_type": false } }, "mappings": {