Merge branch 'master' into 52115

.ci/Jenkinsfile_coverage

@@ -44,7 +44,7 @@ kibanaPipeline(timeoutMinutes: 180) {
           'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
         ]),
       ])
-      workers.base(name: 'coverage-worker', label: 'tests-l', ramDisk: false, bootstrapped: false) {
+      workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
         kibanaPipeline.downloadCoverageArtifacts()
         kibanaPipeline.bash(
           '''

.ci/Jenkinsfile_visual_baseline

@@ -7,12 +7,12 @@ kibanaPipeline(timeoutMinutes: 120) {
   catchError {
     parallel([
       'oss-visualRegression': {
-        workers.ci(name: 'oss-visualRegression', label: 'linux && immutable', ramDisk: false) {
+        workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
           kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
         }
       },
       'xpack-visualRegression': {
-        workers.ci(name: 'xpack-visualRegression', label: 'linux && immutable', ramDisk: false) {
+        workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
           kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
         }
       },

.ci/es-snapshots/Jenkinsfile_build_es

@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
 timeout(time: 120, unit: 'MINUTES') {
   timestamps {
     ansiColor('xterm') {
-      node('linux && immutable') {
+      node(workers.label('s')) {
         catchErrors {
           def VERSION
           def SNAPSHOT_ID

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -61,7 +61,7 @@ kibanaPipeline(timeoutMinutes: 120) {
 }
 
 def promoteSnapshot(snapshotVersion, snapshotId) {
-  node('linux && immutable') {
+  node(workers.label('s')) {
     esSnapshots.promote(snapshotVersion, snapshotId)
   }
 }

docs/management/managing-indices.asciidoc

@@ -126,6 +126,23 @@ under the *Mapped fields* tab as follows:
 [role="screenshot"]
 image::images/management-index-templates-mappings.png[Mapped fields page]
 
+Alternatively, you can click the *Load JSON* link and define the mapping as JSON:
+
+[source,js]
+----------------------------------
+{	
+  "properties": {
+    "geo": {
+      "properties": {	
+        "coordinates": {	
+          "type": "geo_point"	
+        }  	
+      }    	
+    }	
+  }	
+}	
+----------------------------------
+
 You can create additional mapping configurations in the *Dynamic templates* and
 *Advanced options* tabs. No additional mappings are required for this example.
 

src/legacy/core_plugins/kibana/index.js

@@ -58,7 +58,6 @@ export default function(kibana) {
         'plugins/kibana/discover/legacy',
         'plugins/kibana/dev_tools',
         'plugins/kibana/visualize/legacy',
-        'plugins/kibana/dashboard/legacy',
       ],
       app: {
         id: 'kibana',

src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts

@@ -16,28 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-jest.mock(
-  'ui/chrome',
-  () => ({
-    getKibanaVersion: () => '6.3.0',
-  }),
-  { virtual: true }
-);
-
-jest.mock(
-  'ui/notify',
-  () => ({
-    toastNotifications: {
-      addDanger: () => {},
-    },
-  }),
-  { virtual: true }
-);
-
-jest.mock('ui/new_platform');
-
 import { migratePanelsTo730 } from './migrate_to_730_panels';
-import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from '../np_ready/types';
 import {
   RawSavedDashboardPanelTo60,
   RawSavedDashboardPanel610,
@@ -46,6 +25,8 @@ import {
   RawSavedDashboardPanel640To720,
   DEFAULT_PANEL_WIDTH,
   DEFAULT_PANEL_HEIGHT,
+  SavedDashboardPanelTo60,
+  SavedDashboardPanel730ToLatest,
 } from '../../../../../../plugins/dashboard/public';
 
 test('6.0 migrates uiState, sort, scales, and gridData', async () => {

src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts

@@ -27,14 +27,11 @@ import {
   RawSavedDashboardPanel730ToLatest,
   RawSavedDashboardPanel610,
   RawSavedDashboardPanel620,
-} from '../../../../../../plugins/dashboard/public';
-
-import {
   SavedDashboardPanelTo60,
   SavedDashboardPanel620,
   SavedDashboardPanel630,
   SavedDashboardPanel610,
-} from '../np_ready/types';
+} from '../../../../../../plugins/dashboard/public';
 
 const PANEL_HEIGHT_SCALE_FACTOR = 5;
 const PANEL_HEIGHT_SCALE_FACTOR_WITH_MARGINS = 4;

src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { migrations } from '../../../migrations/';
+import { migrations } from '../../../migrations';
 import { migrations730 } from './migrations_730';
 import {
   DashboardDoc700To720,

src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Filter, Query } from '../../../../../../plugins/data/public';
+import { Filter, Query } from 'src/plugins/data/public';
 
 export interface Pre600FilterQuery {
   // pre 6.0.0 global query:queryString:options were stored per dashboard and would