Merge remote-tracking branch 'upstream/master' into migrate-tsvb-api

.ci/Jenkinsfile_coverage

@@ -16,14 +16,14 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
  withEnv([
  'NODE_ENV=test' // Needed for jest tests only
  ]) {
- kibanaPipeline.legacyJobRunner('kibana-intake')()
+ kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
  }
  },
  'x-pack-intake-agent': {
  withEnv([
  'NODE_ENV=test' // Needed for jest tests only
  ]) {
- kibanaPipeline.legacyJobRunner('x-pack-intake')()
+ kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh')()
  }
  },
  'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -26,8 +26,8 @@ timeout(time: 120, unit: 'MINUTES') {
  withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
  parallel([
  // TODO we just need to run integration tests from intake?
- 'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
- 'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+ 'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
+ 'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
  'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
  'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
  'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),

.ci/jobs.yml

@@ -1,3 +1,5 @@
+# This file is needed by functionalTests:ensureAllTestsInCiGroup for the list of ciGroups. That must be changed before this file can be removed
+
 JOB:
  - kibana-intake
  - x-pack-intake

.eslintignore

@@ -9,6 +9,7 @@ bower_components
 /built_assets
 /html_docs
 /src/plugins/data/common/es_query/kuery/ast/_generated_/**
+/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
 /src/legacy/ui/public/angular-bootstrap
 /src/legacy/ui/public/flot-charts

.eslintrc.js

@@ -244,15 +244,15 @@ module.exports = {
  {
  target: [
  '(src|x-pack)/plugins/**/*',
- '!(src|x-pack)/plugins/*/server/**/*',
+ '!(src|x-pack)/plugins/**/server/**/*',
 
  'src/legacy/core_plugins/**/*',
- '!src/legacy/core_plugins/*/server/**/*',
- '!src/legacy/core_plugins/*/index.{js,ts,tsx}',
+ '!src/legacy/core_plugins/**/server/**/*',
+ '!src/legacy/core_plugins/**/index.{js,ts,tsx}',
 
  'x-pack/legacy/plugins/**/*',
- '!x-pack/legacy/plugins/*/server/**/*',
- '!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
+ '!x-pack/legacy/plugins/**/server/**/*',
+ '!x-pack/legacy/plugins/**/index.{js,ts,tsx}',
 
  'examples/**/*',
  '!examples/**/server/**/*',
@@ -262,6 +262,8 @@ module.exports = {
  'src/core/server/**/*',
  '(src|x-pack)/plugins/*/server/**/*',
  'examples/**/server/**/*',
+ // TODO: Remove the 'joi' eslint rule once IE11 support is dropped
+ 'joi',
  ],
  errorMessage:
  'Server modules cannot be imported into client modules or shared modules.',

.github/CODEOWNERS

@@ -15,7 +15,11 @@
 /src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
 /src/legacy/core_plugins/metrics/ @elastic/kibana-app
-/src/plugins/home/ @elastic/kibana-app
+/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
+# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
+/src/plugins/home/public @elastic/kibana-app
+/src/plugins/home/server/*.ts @elastic/kibana-app
+/src/plugins/home/server/services/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/timelion/ @elastic/kibana-app
 /src/plugins/dev_tools/ @elastic/kibana-app
@@ -44,8 +48,11 @@
 
 # APM
 /x-pack/legacy/plugins/apm/ @elastic/apm-ui
+/x-pack/plugins/apm/ @elastic/apm-ui
 /x-pack/test/functional/apps/apm/ @elastic/apm-ui
 /src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
+/src/plugins/apm_oss/ @elastic/apm-ui
+/src/apm.js @watson
 
 # Beats
 /x-pack/legacy/plugins/beats_management/ @elastic/beats
@@ -128,6 +135,7 @@
 # Kibana Alerting Services
 /x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
 /x-pack/legacy/plugins/actions/ @elastic/kibana-alerting-services
+/x-pack/plugins/event_log/ @elastic/kibana-alerting-services
 /x-pack/plugins/task_manager/ @elastic/kibana-alerting-services
 /x-pack/test/alerting_api_integration/ @elastic/kibana-alerting-services
 /x-pack/test/plugin_api_integration/plugins/task_manager/ @elastic/kibana-alerting-services
@@ -149,6 +157,6 @@
 /x-pack/legacy/plugins/license_management/ @elastic/es-ui
 /x-pack/legacy/plugins/remote_clusters/ @elastic/es-ui
 /x-pack/legacy/plugins/rollup/ @elastic/es-ui
-/x-pack/legacy/plugins/searchprofiler/ @elastic/es-ui
+/x-pack/plugins/searchprofiler/ @elastic/es-ui
 /x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
-/x-pack/legacy/plugins/watcher/ @elastic/es-ui
+/x-pack/plugins/watcher/ @elastic/es-ui

.i18nrc.json

@@ -12,6 +12,7 @@
  "embeddableExamples": "examples/embeddable_examples",
  "share": "src/plugins/share",
  "home": "src/plugins/home",
+ "charts": "src/plugins/charts",
  "esUi": "src/plugins/es_ui_shared",
  "devTools": "src/plugins/dev_tools",
  "expressions": "src/plugins/expressions",
@@ -21,7 +22,6 @@
  "interpreter": "src/legacy/core_plugins/interpreter",
  "kbn": "src/legacy/core_plugins/kibana",
  "kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
- "kbnVislibVisTypes": "src/legacy/core_plugins/vis_type_vislib",
  "management": ["src/legacy/core_plugins/management", "src/plugins/management"],
  "kibana_react": "src/legacy/core_plugins/kibana_react",
  "kibana-react": "src/plugins/kibana_react",
@@ -33,14 +33,15 @@
  "statusPage": "src/legacy/core_plugins/status_page",
  "telemetry": "src/legacy/core_plugins/telemetry",
  "tileMap": "src/legacy/core_plugins/tile_map",
- "timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion"],
+ "timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
  "uiActions": "src/plugins/ui_actions",
  "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
  "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
  "visTypeTable": "src/legacy/core_plugins/vis_type_table",
  "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
  "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
  "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
+ "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
  "visualizations": [
  "src/plugins/visualizations",
  "src/legacy/core_plugins/visualizations"

CONTRIBUTING.md

@@ -338,7 +338,7 @@ The `config/kibana.yml` file stores user configuration directives. Since this fi
 
 #### Setting Up SSL
 
-Kibana includes a self-signed certificate that can be used for development purposes: `yarn start --ssl`.
+Kibana includes self-signed certificates that can be used for development purposes in the browser and for communicating with Elasticsearch: `yarn start --ssl` & `yarn es snapshot --ssl`.
 
 ### Linting
 

Jenkinsfile

@@ -4,16 +4,21 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a little bit
- timeout(time: 120, unit: 'MINUTES') {
+ timeout(time: 135, unit: 'MINUTES') {
  timestamps {
  ansiColor('xterm') {
  githubPr.withDefaultPrComments {
  catchError {
+ retryable.enable()
  parallel([
- 'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
- 'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+ 'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
+ 'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
  'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
- 'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
+ 'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', {
+ retryable('kibana-firefoxSmoke') {
+ runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke')
+ }
+ }),
  'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
  'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
  'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
@@ -26,11 +31,19 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
  'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
  'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
  'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
- 'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility') }),
+ 'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', {
+ retryable('kibana-accessibility') {
+ runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility')
+ }
+ }),
  // 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
  ]),
  'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
- 'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
+ 'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', {
+ retryable('xpack-firefoxSmoke') {
+ runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke')
+ }
+ }),
  'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
  'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
  'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
@@ -41,12 +54,18 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
  'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
  'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
  'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
- 'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility') }),
+ 'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', {
+ retryable('xpack-accessibility') {
+ runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility')
+ }
+ }),
  // 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
  ]),
  ])
  }
  }
+
+ retryable.printFlakyFailures()
  kibanaPipeline.sendMail()
  }
  }

api-documenter.json

@@ -0,0 +1,4 @@
+{
+ "newlineKind": "lf",
+ "outputTarget": "markdown"
+}

docs/api/saved-objects/import.asciidoc

@@ -57,7 +57,7 @@ Import an index pattern and dashboard:
 
 [source,js]
 --------------------------------------------------
-$ curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form [email protected] <1>
+$ curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form [email protected]
 --------------------------------------------------
 
 The `file.ndjson` file contains the following:

docs/developer/add-data-guide.asciidoc

@@ -11,23 +11,24 @@ Each tutorial contains three sets of instructions:
 
 [float]
 === Creating a new tutorial
-// TODO: update path to where the directory must be created on the new platform
-1. Create a new directory in the link:https:/elastic/kibana/tree/master/src/legacy/core_plugins/kibana/server/tutorials[tutorials directory].
-2. In the new directory, create a file called `index.js` that exports a function.
-The function must return a JavaScript object that conforms to the link:https:/elastic/kibana/blob/master/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts[tutorial schema].
-// TODO: update path to where the tutorial must be registered on the new platform
-3. Register the tutorial in link:https:/elastic/kibana/blob/master/src/legacy/core_plugins/kibana/server/tutorials/register.js[register.js] by calling `server.newPlatform.setup.plugins.home.tutorials.registerTutorial(myFuncImportedFromIndexJs)`.
-// TODO: update path to where the image assets must be added on the new platform
+1. Create a new directory in the link:https:/elastic/kibana/tree/master/src/plugins/home/server/tutorials[tutorials directory].
+2. In the new directory, create a file called `index.ts` that exports a function.
+The function must return a function object that conforms to the `TutorialSchema` interface link:https:/elastic/kibana/blob/master/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts[tutorial schema].
+3. Register the tutorial in link:https:/elastic/kibana/blob/master/src/plugins/home/server/tutorials/register.ts[register.ts] by adding it to the `builtInTutorials`.
+// TODO update path once assets are migrated
 4. Add image assets to the link:https:/elastic/kibana/tree/master/src/legacy/core_plugins/kibana/public/home/tutorial_resources[tutorial_resources directory].
 5. Run Kibana locally to preview the tutorial.
 6. Create a PR and go through the review process to get the changes approved.
 
+If you are creating a new plugin and the tutorial is only related to that plugin, you can also place the `TutorialSchema` object into your plugin folder. Add `home` to the `requiredPlugins` list in your `kibana.json` file.
+Then register the tutorial object by calling `home.tutorials.registerTutorial(tutorialObject)` in the `setup` lifecycle of your server plugin.
+
 [float]
 ==== Variables
 String values can contain variables that are substituted when rendered. Variables are specified by `{}`.
 For example: `{config.docs.version}` is rendered as `6.2` when running the tutorial in Kibana 6.2.
 
-link:https:/elastic/kibana/blob/master/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js#L23[Provided variables]
+link:https:/elastic/kibana/blob/master/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js#L23[Provided variables]
 
 [float]
 ==== Markdown

docs/developer/visualize/development-create-visualization.asciidoc

@@ -62,7 +62,7 @@ The list of common parameters:
 - *visualization*: A constructor function for a Visualization.
 - *requestHandler*: <string> one of the available request handlers or a <function> for a custom request handler
 - *responseHandler*: <string> one of the available response handlers or a <function> for a custom response handler
-- *editor*: <string> one of the available editors or Editor class for custom one
+- *editor*: Editor class for custom one
 - *editorConfig*: object holding editor parameters
 - *options.showTimePicker*: <bool> show or hide time filter (defaults to true)
 - *options.showQueryBar*: <bool> show or hide query bar (defaults to true)
@@ -218,7 +218,6 @@ These tabs should be React components.
  title: 'My New Vis',
  icon: 'my_icon',
  description: 'Cool new chart',
- editor: 'default',
  editorConfig: {
  optionsTemplate: MyReactComponent // or if multiple tabs are required:
  optionTabs: [

docs/development/core/public/index.md

@@ -1,12 +1,12 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md)
-
-## API Reference
-
-## Packages
-
-| Package | Description |
-| --- | --- |
-| [kibana-plugin-public](./kibana-plugin-public.md) | The Kibana Core APIs for client-side plugins.<!-- -->A plugin's <code>public/index</code> file must contain a named import, <code>plugin</code>, that implements which returns an object that implements .<!-- -->The plugin integrates with the core system via lifecycle events: <code>setup</code>, <code>start</code>, and <code>stop</code>. In each lifecycle method, the plugin will receive the corresponding core services available (either or ) and any interfaces returned by dependency plugins' lifecycle method. Anything returned by the plugin's lifecycle method will be exposed to downstream dependencies when their corresponding lifecycle methods are invoked. |
-
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md)
+
+## API Reference
+
+## Packages
+
+| Package | Description |
+| --- | --- |
+| [kibana-plugin-public](./kibana-plugin-public.md) | The Kibana Core APIs for client-side plugins.<!-- -->A plugin's <code>public/index</code> file must contain a named import, <code>plugin</code>, that implements which returns an object that implements .<!-- -->The plugin integrates with the core system via lifecycle events: <code>setup</code>, <code>start</code>, and <code>stop</code>. In each lifecycle method, the plugin will receive the corresponding core services available (either or ) and any interfaces returned by dependency plugins' lifecycle method. Anything returned by the plugin's lifecycle method will be exposed to downstream dependencies when their corresponding lifecycle methods are invoked. |
+