diff --git a/package.json b/package.json index edf5a1930b1f..9227ccf9378f 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "grunt-cli": "0.1.13", "grunt-contrib-clean": "0.6.0", "grunt-contrib-copy": "0.8.1", - "grunt-esvm": "3.0.4", + "grunt-esvm": "3.1.1", "grunt-karma": "0.12.0", "grunt-run": "0.5.0", "grunt-s3": "0.2.0-alpha.3", diff --git a/src/fixtures/logstash_fields.js b/src/fixtures/logstash_fields.js index 92b57c27b965..c23cfafbbcaf 100644 --- a/src/fixtures/logstash_fields.js +++ b/src/fixtures/logstash_fields.js @@ -16,7 +16,7 @@ function stubbedLogstashFields() { { name: 'extension', type: 'string', indexed: true, analyzed: true, sortable: true, filterable: true }, { name: 'machine.os', type: 'string', indexed: true, analyzed: true, sortable: true, filterable: true }, { name: 'geo.src', type: 'string', indexed: true, analyzed: true, sortable: true, filterable: true }, - { name: '_type', type: 'string', indexed: true, analyzed: true, sortable: true, filterable: true }, + { name: '_type', type: 'string', indexed: false, analyzed: true, sortable: true, filterable: true }, { name: '_id', type: 'string', indexed: false, analyzed: false, sortable: false, filterable: true}, { name: '_source', type: 'string', indexed: false, analyzed: false, sortable: false, filterable: false}, { name: 'custom_user_field', type: 'conflict', indexed: false, analyzed: false, sortable: false, filterable: true }, diff --git a/src/plugins/kbn_vislib_vis_types/public/tile_map.js b/src/plugins/kbn_vislib_vis_types/public/tile_map.js index 788b50e832e8..acc7e4591848 100644 --- a/src/plugins/kbn_vislib_vis_types/public/tile_map.js +++ b/src/plugins/kbn_vislib_vis_types/public/tile_map.js @@ -5,6 +5,7 @@ import VisSchemasProvider from 'ui/vis/schemas'; import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json'; import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter'; import tileMapTemplate from 'plugins/kbn_vislib_vis_types/editors/tile_map.html'; + export default function TileMapVisType(Private, getAppState, courier, config) { const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); @@ -120,6 +121,8 @@ export default function TileMapVisType(Private, getAppState, courier, config) { group: 'buckets', name: 'split', title: 'Split Chart', + deprecate: true, + deprecateMessage: 'The Split Chart feature for Tile Maps has been deprecated.', min: 0, max: 1 } diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html index 89b92ea703a5..8b4021ab8053 100644 --- a/src/plugins/kibana/public/dashboard/index.html +++ b/src/plugins/kibana/public/dashboard/index.html @@ -1,5 +1,5 @@