Merge branch 'master' of https://github.com/elastic/kibana into panel…

…-refactor-cleanup

docs/dashboard.asciidoc

@@ -133,7 +133,7 @@ to open *Management/Kibana/Saved Objects/Dashboards*.
 [[sharing-dashboards]]
 == Sharing a Dashboard
 
-You can can share a direct link to a Kibana dashboard with another user,
+You can either share a direct link to a Kibana dashboard with another user,
 or embed the dashboard in a web page. Users must have Kibana access
 to view embedded dashboards.
 

docs/setup/connect-to-elasticsearch.asciidoc

@@ -32,8 +32,8 @@ sophisticated date parsing APIs that Kibana uses to determine date information,
 specify dates in the index pattern name.
 +
 . Click *Create* to add the index pattern. This first pattern is automatically configured as the default.
-When you have more than one index pattern, you can designate which one to use as the default from
-*Settings > Indices*.
+When you have more than one index pattern, you can designate which one to use as the default by clicking 
+on the star icon above the index pattern title from *Management > Index Patterns*.
 
 All done! Kibana is now connected to your Elasticsearch data. Kibana displays a read-only list of fields
 configured for the matching index.

docs/visualize.asciidoc

@@ -33,6 +33,7 @@ different series.
 instructions.
 <<metric-chart,Metric>>:: Display a single number.
 <<pie-chart,Pie chart>>:: Display each source's contribution to a total.
+<<tagcloud-chart,Tag cloud>>:: Display words as a cloud in which the size of the word correspond to its importance
 <<tilemap,Tile map>>:: Associate the results of an aggregation with geographic
 locations.
 Timeseries:: Compute and combine data from multiple time series

docs/visualize/tagcloud.asciidoc

@@ -1,5 +1,5 @@
 [[tagcloud-chart]]
-== Cloud Tag Charts
+== Tag Clouds
 
 A tag cloud visualization is a visual representation of text data, typically used to visualize free form text. 
 Tags are usually single words, and the importance of each tag is shown with font size or color.

src/core_plugins/elasticsearch/lib/__tests__/create_kibana_index.js

@@ -53,9 +53,7 @@ describe('plugins/elasticsearch', function () {
           expect(params.body.mappings.config.properties)
             .to.have.property('buildNum');
           expect(params.body.mappings.config.properties.buildNum)
-            .to.have.property('type', 'string');
-          expect(params.body.mappings.config.properties.buildNum)
-            .to.have.property('index', 'not_analyzed');
+            .to.have.property('type', 'keyword');
         });
       });
 

src/core_plugins/elasticsearch/lib/kibana_index_mappings.js

@@ -2,8 +2,7 @@ export const mappings = {
   config: {
     properties: {
       buildNum: {
-        type: 'string',
-        index: 'not_analyzed'
+        type: 'keyword'
       }
     }
   },

src/core_plugins/kbn_vislib_vis_types/public/area.js

@@ -16,7 +16,6 @@ export default function HistogramVisType(Private) {
       'effect on the series above it.',
     params: {
       defaults: {
-        shareYAxis: true,
         addTooltip: true,
         addLegend: true,
         legendPosition: 'right',
@@ -27,8 +26,7 @@ export default function HistogramVisType(Private) {
         times: [],
         addTimeMarker: false,
         defaultYExtents: false,
-        setYExtents: false,
-        yAxis: {}
+        setYExtents: false
       },
       legendPositions: [{
         value: 'left',

src/core_plugins/kbn_vislib_vis_types/public/histogram.js

@@ -14,7 +14,6 @@ export default function HistogramVisType(Private) {
     'exact numbers or percentages. If you are not sure which chart you need, you could do worse than to start here.',
     params: {
       defaults: {
-        shareYAxis: true,
         addTooltip: true,
         addLegend: true,
         legendPosition: 'right',
@@ -23,8 +22,7 @@ export default function HistogramVisType(Private) {
         times: [],
         addTimeMarker: false,
         defaultYExtents: false,
-        setYExtents: false,
-        yAxis: {}
+        setYExtents: false
       },
       legendPositions: [{
         value: 'left',

src/core_plugins/kbn_vislib_vis_types/public/line.js

@@ -14,7 +14,6 @@ export default function HistogramVisType(Private) {
       'Be careful with sparse sets as the connection between points can be misleading.',
     params: {
       defaults: {
-        shareYAxis: true,
         addTooltip: true,
         addLegend: true,
         legendPosition: 'right',
@@ -27,8 +26,7 @@ export default function HistogramVisType(Private) {
         times: [],
         addTimeMarker: false,
         defaultYExtents: false,
-        setYExtents: false,
-        yAxis: {}
+        setYExtents: false
       },
       legendPositions: [{
         value: 'left',

src/core_plugins/kbn_vislib_vis_types/public/pie.js

@@ -14,7 +14,6 @@ export default function HistogramVisType(Private) {
      'Pro Tip: Pie charts are best used sparingly, and with no more than 7 slices per pie.',
     params: {
       defaults: {
-        shareYAxis: true,
         addTooltip: true,
         addLegend: true,
         legendPosition: 'right',

src/core_plugins/kibana/public/dashboard/directives/grid.js

@@ -55,20 +55,6 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
       function init() {
         $el.addClass('gridster');
 
-        // See issue https://github.com/elastic/kibana/issues/2138 and the
-        // subsequent fix for why we need to sort here. Short story is that
-        // gridster can fail to render widgets in the correct order, depending
-        // on the specific order of the panels.
-        // See https://github.com/ducksboard/gridster.js/issues/147
-        // for some additional back story.
-        $state.panels.sort((a, b) => {
-          if (a.row === b.row) {
-            return a.col - b.col;
-          } else {
-            return a.row - b.row;
-          }
-        });
-
         gridster = $el.gridster({
           max_cols: COLS,
           min_cols: COLS,
@@ -104,7 +90,23 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
           const added = _.difference(panels, currentPanels);
 
           if (removed.length) removed.forEach(removePanel);
-          if (added.length) added.forEach(addPanel);
+          if (added.length) {
+            // See issue https://github.com/elastic/kibana/issues/2138 and the
+            // subsequent fix for why we need to sort here. Short story is that
+            // gridster can fail to render widgets in the correct order, depending
+            // on the specific order of the panels.
+            // See https://github.com/ducksboard/gridster.js/issues/147
+            // for some additional back story.
+            added.sort((a, b) => {
+              if (a.row === b.row) {
+                return a.col - b.col;
+              } else {
+                return a.row - b.row;
+              }
+            });
+
+            added.forEach(addPanel);
+          };
 
           // ensure that every panel can be serialized now that we are done
           $state.panels.forEach(PanelUtils.makeSerializeable);

src/core_plugins/kibana/public/dashboard/services/_saved_dashboard.js

@@ -46,20 +46,20 @@ module.factory('SavedDashboard', function (courier, config) {
 
   // if type:dashboard has no mapping, we push this mapping into ES
   SavedDashboard.mapping = {
-    title: 'string',
+    title: 'text',
     hits: 'integer',
-    description: 'string',
-    panelsJSON: 'string',
-    optionsJSON: 'string',
-    uiStateJSON: 'string',
+    description: 'text',
+    panelsJSON: 'keyword',
+    optionsJSON: 'keyword',
+    uiStateJSON: 'keyword',
     version: 'integer',
     timeRestore: 'boolean',
-    timeTo: 'string',
-    timeFrom: 'string',
+    timeTo: 'keyword',
+    timeFrom: 'keyword',
     refreshInterval: {
       type: 'object',
       properties: {
-        display: {type: 'string'},
+        display: {type: 'keyword'},
         pause: { type: 'boolean'},
         section: { type: 'integer'},
         value: { type: 'integer'}

src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js

@@ -31,11 +31,11 @@ module.factory('SavedSearch', function (courier) {
   SavedSearch.type = 'search';
 
   SavedSearch.mapping = {
-    title: 'string',
-    description: 'string',
+    title: 'text',
+    description: 'text',
     hits: 'integer',
-    columns: 'string',
-    sort: 'string',
+    columns: 'keyword',
+    sort: 'keyword',
     version: 'integer'
   };
 

src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js

@@ -53,11 +53,11 @@ uiModules
   SavedVis.type = 'visualization';
 
   SavedVis.mapping = {
-    title: 'string',
+    title: 'text',
     visState: 'json',
-    uiStateJSON: 'string',
-    description: 'string',
-    savedSearchId: 'string',
+    uiStateJSON: 'keyword',
+    description: 'text',
+    savedSearchId: 'keyword',
     version: 'integer'
   };