fix merge conflixts

.backportrc.json

@@ -1,5 +1,5 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "7.x", "checked": true }, "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
+  "branches": [{ "name": "7.x", "checked": true }, "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
   "labels": ["backport"]
 }

.eslintignore

@@ -33,6 +33,7 @@ bower_components
 /x-pack/legacy/plugins/**/__tests__/fixtures/**
 /packages/kbn-interpreter/src/common/lib/grammar.js
 /x-pack/legacy/plugins/canvas/canvas_plugin
+/x-pack/legacy/plugins/canvas/shareable_runtime/build
 /x-pack/legacy/plugins/canvas/storybook
 /x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/legacy/plugins/infra/common/graphql/types.ts

.eslintrc.js

@@ -149,6 +149,10 @@ module.exports = {
                   'src/core/server/**/*',
                   '!src/core/server/index.ts',
                   '!src/core/server/mocks.ts',
+                  '!src/core/server/types.ts',
+                  // for absolute imports until fixed in
+                  // https://github.com/elastic/kibana/issues/36096
+                  '!src/core/server/types',
                   '!src/core/server/*.test.mocks.ts',
 
                   'src/plugins/**/public/**/*',

.github/CODEOWNERS

@@ -27,8 +27,9 @@
 /x-pack/test/functional/apps/code/  @teams/code
 /x-pack/test/api_integration/apis/code/  @teams/code
 
-# Infrastructure and Logs UI
-/x-pack/legacy/plugins/infra/ @elastic/infra-logs-ui
+# Logs & Metrics UI
+/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
+/x-pack/legacy/plugins/integrations_manager/ @elastic/epm
 
 # Machine Learning
 /x-pack/legacy/plugins/ml/  @elastic/ml-ui
@@ -46,7 +47,6 @@
 # Platform
 /src/core/  @elastic/kibana-platform
 /src/legacy/server/saved_objects/  @elastic/kibana-platform
-/src/legacy/ui/public/saved_objects  @elastic/kibana-platform
 /config/kibana.yml @elastic/kibana-platform
 /x-pack/plugins/features/  @elastic/kibana-platform
 
@@ -56,6 +56,7 @@
 /x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /src/legacy/server/csp/ @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
+/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
 
 # Kibana Stack Services
 /packages/kbn-analytics/ @elastic/kibana-stack-services

.i18nrc.json

@@ -28,6 +28,7 @@
     "kbnESQuery": "packages/kbn-es-query",
     "inspector": "src/plugins/inspector",
     "kibana-react": "src/plugins/kibana_react",
+    "telemetry": "src/legacy/core_plugins/telemetry",
     "esUi": "src/plugins/es_ui_shared",
     "uiActions": "src/plugins/ui_actions"
   },

.sass-lint.yml

@@ -7,6 +7,8 @@ files:
     - 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
+  ignore:
+    - 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
 rules:

CONTRIBUTING.md

@@ -306,6 +306,8 @@ IntelliJ   | Settings » Languages & Frameworks » JavaScript » Code Quality To
 
 Another tool we use for enforcing consistent coding style is EditorConfig, which can be set up by installing a plugin in your editor that dynamically updates its configuration. Take a look at the [EditorConfig](http://editorconfig.org/#download) site to find a plugin for your editor, and browse our [`.editorconfig`](https://github.com/elastic/kibana/blob/master/.editorconfig) file to see what config rules we set up.
 
+#### Setup Guide for VS Code Users
+
 Note that for VSCode, to enable "live" linting of TypeScript (and other) file types, you will need to modify your local settings, as shown below.  The default for the ESLint extension is to only lint JavaScript file types.
 
 ```json
@@ -317,6 +319,14 @@ Note that for VSCode, to enable "live" linting of TypeScript (and other) file ty
 ]
 ```
 
+`eslint` can automatically fix trivial lint errors when you save a file by adding this line in your setting.
+
+```json
+  "eslint.autoFixOnSave": true,
+```
+
+It is **not** recommended to use `prettier` plugin on Kibana project. Because settings are in `eslintrc.js` file and it is applied to too many files that shouldn't be prettier-ized. 
+
 ### Internationalization
 
 All user-facing labels and info texts in Kibana should be internationalized. Please take a look at the [readme](packages/kbn-i18n/README.md) and the [guideline](packages/kbn-i18n/GUIDELINE.md) of the i18n package on how to do so.

Jenkinsfile

@@ -17,8 +17,6 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
               'oss-ciGroup4': getOssCiGroupWorker(4),
               'oss-ciGroup5': getOssCiGroupWorker(5),
               'oss-ciGroup6': getOssCiGroupWorker(6),
-            ]),
-            'kibana-oss-agent2': withWorkers('kibana-oss-tests2', { buildOss() }, [
               'oss-ciGroup7': getOssCiGroupWorker(7),
               'oss-ciGroup8': getOssCiGroupWorker(8),
               'oss-ciGroup9': getOssCiGroupWorker(9),
@@ -34,8 +32,6 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
               'xpack-ciGroup3': getXpackCiGroupWorker(3),
               'xpack-ciGroup4': getXpackCiGroupWorker(4),
               'xpack-ciGroup5': getXpackCiGroupWorker(5),
-            ]),
-            'kibana-xpack-agent2': withWorkers('kibana-xpack-tests2', { buildXpack() }, [
               'xpack-ciGroup6': getXpackCiGroupWorker(6),
               'xpack-ciGroup7': getXpackCiGroupWorker(7),
               'xpack-ciGroup8': getXpackCiGroupWorker(8),
@@ -60,7 +56,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
 
 def withWorkers(name, preWorkerClosure = {}, workerClosures = [:]) {
   return {
-    jobRunner('tests-xl') {
+    jobRunner('tests-xl', true) {
       try {
         doSetup()
         preWorkerClosure()
@@ -151,7 +147,7 @@ def legacyJobRunner(name) {
         withEnv([
           "JOB=${name}",
         ]) {
-          jobRunner('linux && immutable') {
+          jobRunner('linux && immutable', false) {
             try {
               runbld('.ci/run.sh', true)
             } finally {
@@ -172,8 +168,21 @@ def legacyJobRunner(name) {
   }
 }
 
-def jobRunner(label, closure) {
+def jobRunner(label, useRamDisk, closure) {
   node(label) {
+    if (useRamDisk) {
+      // Move to a temporary workspace, so that we can symlink the real workspace into /dev/shm
+      def originalWorkspace = env.WORKSPACE
+      ws('/tmp/workspace') {
+        sh """
+          mkdir -p /dev/shm/workspace
+          mkdir -p '${originalWorkspace}' # create all of the directories leading up to the workspace, if they don't exist
+          rm --preserve-root -rf '${originalWorkspace}' # then remove just the workspace, just in case there's stuff in it
+          ln -s /dev/shm/workspace '${originalWorkspace}'
+        """
+      }
+    }
+
     def scmVars = checkout scm
 
     withEnv([

docs/api/dashboard-api.asciidoc

@@ -0,0 +1,17 @@
+[[dashboard-api]]
+== Import and export dashboard APIs
+
+Import and export dashboards with the corresponding saved objects, such as visualizations, saved
+searches, and index patterns.
+
+WARNING: Do not write documents directly to the `.kibana` index. When you write directly
+to the `.kibana` index, the data becomes corrupted and permanently breaks future {kib} versions.
+
+The following import and export dashboard APIs are available:
+
+* <<dashboard-import-api, Import dashboard API>> to import dashboards and corresponding saved objects
+
+* <<dashboard-api-export, Export dashboard API>> to export dashboards and corresponding saved objects
+
+include::dashboard/import-dashboard.asciidoc[]
+include::dashboard/export-dashboard.asciidoc[]

docs/api/dashboard/export-dashboard.asciidoc

@@ -0,0 +1,42 @@
+[[dashboard-api-export]]
+=== Export dashboard API
+++++
+<titleabbrev>Export dashboard</titleabbrev>
+++++
+
+experimental[] Export dashboards and corresponding saved objects.
+
+[[dashboard-api-export-request]]
+==== Request
+
+`GET /api/kibana/dashboards/export`
+
+[[dashboard-api-export-params]]
+==== Query parameters
+
+`dashboard`::
+  (Required, array|string) The IDs of the dashboards that you want to export.
+
+[[dashboard-api-export-response-body]]
+==== Response body
+
+`objects`:: 
+  (array) A top level property that includes the saved objects. The order of the objects is not guaranteed. Use the exact response body as the request body for the corresponding <<dashboard-import-api, Import dashboard API>>.
+
+[[dashboard-api-export-codes]]
+==== Response code
+
+`200`::
+  Indicates a successful call.
+
+[float]
+[[dashboard-api-export-example]]
+==== Example
+
+[source,js]
+--------------------------------------------------
+GET api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c <1>
+--------------------------------------------------
+// KIBANA
+
+<1> The dashboard ID is `942dcef0-b2cd-11e8-ad8e-85441f0c2e5c`.