Merge branch 'master' into np/fix-enabled-config

elastic · Mar 25, 2020 · 7965794 · 7965794
2 parents 604a3bb + 008d394
commit 7965794
Show file tree

Hide file tree

Showing 717 changed files with 21,741 additions and 12,454 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,5 +1,5 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "7.x", "checked": true }, "7.6", "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"],
+  "branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "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"]
 }
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -3,7 +3,6 @@
 # For more info, see https://help.github.com/articles/about-codeowners/
 
 # App
-/x-pack/legacy/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/legacy/plugins/lens/ @elastic/kibana-app
 /x-pack/legacy/plugins/graph/ @elastic/kibana-app
 /src/legacy/server/url_shortening/ @elastic/kibana-app

diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,6 @@ package-lock.json
 *.sublime-*
 npm-debug.log*
 .tern-project
+x-pack/legacy/plugins/apm/tsconfig.json
+apm.tsconfig.json
+/x-pack/legacy/plugins/apm/e2e/snapshots.js
diff --git a/examples/alerting_example/public/application.tsx b/examples/alerting_example/public/application.tsx
@@ -25,6 +25,7 @@ import {
   AppMountParameters,
   CoreStart,
   IUiSettingsClient,
+  DocLinksStart,
   ToastsSetup,
 } from '../../../src/core/public';
 import { DataPublicPluginStart } from '../../../src/plugins/data/public';
@@ -45,6 +46,7 @@ export interface AlertingExampleComponentParams {
   data: DataPublicPluginStart;
   charts: ChartsPluginStart;
   uiSettings: IUiSettingsClient;
+  docLinks: DocLinksStart;
   toastNotifications: ToastsSetup;
 }
 
@@ -88,7 +90,7 @@ const AlertingExampleApp = (deps: AlertingExampleComponentParams) => {
 };
 
 export const renderApp = (
-  { application, notifications, http, uiSettings }: CoreStart,
+  { application, notifications, http, uiSettings, docLinks }: CoreStart,
   deps: AlertingExamplePublicStartDeps,
   { appBasePath, element }: AppMountParameters
 ) => {
@@ -99,6 +101,7 @@ export const renderApp = (
       toastNotifications={notifications.toasts}
       http={http}
       uiSettings={uiSettings}
+      docLinks={docLinks}
       {...deps}
     />,
     element

diff --git a/examples/alerting_example/public/components/create_alert.tsx b/examples/alerting_example/public/components/create_alert.tsx
@@ -33,6 +33,7 @@ export const CreateAlert = ({
   triggers_actions_ui,
   charts,
   uiSettings,
+  docLinks,
   data,
   toastNotifications,
 }: AlertingExampleComponentParams) => {
@@ -56,6 +57,7 @@ export const CreateAlert = ({
             alertTypeRegistry: triggers_actions_ui.alertTypeRegistry,
             toastNotifications,
             uiSettings,
+            docLinks,
             charts,
             dataFieldsFormats: data.fieldFormats,
           }}

diff --git a/examples/ui_action_examples/public/plugin.ts b/examples/ui_action_examples/public/plugin.ts
@@ -46,7 +46,7 @@ export class UiActionExamplesPlugin
     }));
 
     uiActions.registerAction(helloWorldAction);
-    uiActions.addTriggerAction(helloWorldTrigger.id, helloWorldAction);
+    uiActions.attachAction(helloWorldTrigger.id, helloWorldAction);
   }
 
   public start() {}

diff --git a/examples/ui_actions_explorer/public/app.tsx b/examples/ui_actions_explorer/public/app.tsx
@@ -95,7 +95,8 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => {
                       );
                     },
                   });
-                  uiActionsApi.addTriggerAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
+                  uiActionsApi.registerAction(dynamicAction);
+                  uiActionsApi.attachAction(HELLO_WORLD_TRIGGER_ID, dynamicAction);
                   setConfirmationText(
                     `You've successfully added a new action: ${dynamicAction.getDisplayName(
                       {}

diff --git a/examples/ui_actions_explorer/public/plugin.tsx b/examples/ui_actions_explorer/public/plugin.tsx
@@ -79,21 +79,21 @@ export class UiActionsExplorerPlugin implements Plugin<void, void, {}, StartDeps
 
     const startServices = core.getStartServices();
 
-    deps.uiActions.addTriggerAction(
+    deps.uiActions.attachAction(
       USER_TRIGGER,
       createPhoneUserAction(async () => (await startServices)[1].uiActions)
     );
-    deps.uiActions.addTriggerAction(
+    deps.uiActions.attachAction(
       USER_TRIGGER,
       createEditUserAction(async () => (await startServices)[0].overlays.openModal)
     );
 
-    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, viewInMapsAction);
-    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, lookUpWeatherAction);
-    deps.uiActions.addTriggerAction(COUNTRY_TRIGGER, showcasePluggability);
-    deps.uiActions.addTriggerAction(PHONE_TRIGGER, makePhoneCallAction);
-    deps.uiActions.addTriggerAction(PHONE_TRIGGER, showcasePluggability);
-    deps.uiActions.addTriggerAction(USER_TRIGGER, showcasePluggability);
+    deps.uiActions.attachAction(COUNTRY_TRIGGER, viewInMapsAction);
+    deps.uiActions.attachAction(COUNTRY_TRIGGER, lookUpWeatherAction);
+    deps.uiActions.attachAction(COUNTRY_TRIGGER, showcasePluggability);
+    deps.uiActions.attachAction(PHONE_TRIGGER, makePhoneCallAction);
+    deps.uiActions.attachAction(PHONE_TRIGGER, showcasePluggability);
+    deps.uiActions.attachAction(USER_TRIGGER, showcasePluggability);
 
     core.application.register({
       id: 'uiActionsExplorer',

diff --git a/package.json b/package.json
@@ -115,12 +115,12 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/register": "^7.7.0",
+    "@babel/core": "^7.9.0",
+    "@babel/register": "^7.9.0",
     "@elastic/apm-rum": "^4.6.0",
     "@elastic/charts": "^18.1.0",
     "@elastic/datemath": "5.0.2",
-    "@elastic/ems-client": "7.7.0",
+    "@elastic/ems-client": "7.7.1",
     "@elastic/eui": "21.0.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
@@ -162,7 +162,7 @@
     "color": "1.0.3",
     "commander": "3.0.2",
     "compare-versions": "3.5.1",
-    "core-js": "^3.2.1",
+    "core-js": "^3.6.4",
     "css-loader": "^3.4.2",
     "d3": "3.5.17",
     "d3-cloud": "1.2.5",
@@ -284,8 +284,8 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.5.5",
-    "@babel/types": "^7.5.5",
+    "@babel/parser": "^7.9.3",
+    "@babel/types": "^7.9.0",
     "@elastic/elasticsearch": "^7.4.0",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
@@ -443,7 +443,7 @@
     "jest": "^24.9.0",
     "jest-cli": "^24.9.0",
     "jest-raw-loader": "^1.0.1",
-    "jimp": "0.8.4",
+    "jimp": "^0.9.6",
     "json5": "^1.0.1",
     "karma": "3.1.4",
     "karma-chrome-launcher": "2.2.0",

diff --git a/packages/elastic-datemath/package.json b/packages/elastic-datemath/package.json
@@ -11,8 +11,8 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/cli": "^7.8.4",
+    "@babel/preset-env": "^7.9.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "moment": "^2.24.0"
   },

diff --git a/packages/kbn-analytics/package.json b/packages/kbn-analytics/package.json
@@ -14,7 +14,7 @@
     "kbn:watch": "node scripts/build --source-maps --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
+    "@babel/cli": "^7.8.4",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
     "typescript": "3.7.2"

diff --git a/packages/kbn-babel-code-parser/package.json b/packages/kbn-babel-code-parser/package.json
@@ -15,12 +15,12 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5"
+    "@babel/cli": "^7.8.4"
   },
   "dependencies": {
     "@kbn/babel-preset": "1.0.0",
-    "@babel/parser": "^7.5.5",
-    "@babel/traverse": "^7.5.5",
+    "@babel/parser": "^7.9.3",
+    "@babel/traverse": "^7.9.0",
     "lodash": "^4.17.15"
   }
 }
diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json
@@ -4,14 +4,14 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.5.1",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.7.4",
-    "@babel/preset-typescript": "^7.7.4",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-modules-commonjs": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-react": "^7.9.1",
+    "@babel/preset-typescript": "^7.9.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-filter-imports": "^3.0.0",
     "babel-plugin-styled-components": "^1.10.6",

diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
@@ -12,8 +12,8 @@
     "kbn:watch": "node scripts/build --watch --source-maps"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.9.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@types/intl-relativeformat": "^2.1.0",

diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
@@ -9,16 +9,16 @@
     "kbn:watch": "node scripts/build --dev --watch"
   },
   "dependencies": {
-    "@babel/runtime": "^7.5.5",
+    "@babel/runtime": "^7.9.2",
     "@kbn/i18n": "1.0.0",
     "lodash": "npm:@elastic/[email protected]",
     "lodash.clone": "^4.5.0",
     "uuid": "3.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.9.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "babel-loader": "^8.0.6",

diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json
@@ -10,7 +10,7 @@
     "kbn:watch": "yarn build --watch"
   },
   "dependencies": {
-    "@babel/cli": "^7.5.5",
+    "@babel/cli": "^7.8.4",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/ui-shared-deps": "1.0.0",

diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
@@ -13,7 +13,7 @@
     "@kbn/babel-preset": "1.0.0"
   },
   "dependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.9.0",
     "argv-split": "^2.0.1",
     "commander": "^3.0.0",
     "del": "^5.1.0",