Merge branch '7.6' into backport/7.6/pr-57539

elastic · Feb 25, 2020 · 52a8003 · 52a8003
2 parents 797030b + 7821f87
commit 52a8003
Show file tree

Hide file tree

Showing 238 changed files with 6,173 additions and 1,633 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -54,11 +54,9 @@ Granted that you share your thoughts, we might even be able to come up with crea
 
 First of all, **sorry about that!** We want you to have a great time with Kibana.
 
-Hosting meaningful discussions on GitHub can be challenging. For that reason, we'll sometimes ask that you join us on IRC _([#kibana](https://kiwiirc.com/client/irc.freenode.net/?#kibana) on freenode)_ to chat about your issues. You may also experience **faster response times** when engaging us via IRC.
-
 There's hundreds of open issues and prioritizing what to work on is an important aspect of our daily jobs. We prioritize issues according to impact and difficulty, so some issues can be neglected while we work on more pressing issues.
 
-Feel free to bump your issues if you think they've been neglected for a prolonged period, or just jump on IRC and let us have it!
+Feel free to bump your issues if you think they've been neglected for a prolonged period.
 
 ### "I want to help!"
 

diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
@@ -317,6 +317,7 @@ Management::
 * Handle double quote special case {pull}54474[#54474]
 * Fixes handling of bad profile data and update tab behavior {pull}55806[#55806]
 * Fixes icon path in tutorial introduction {pull}49684[#49684]
+* Fixes index templates editor to support mappings types {pull}55804[#55804]
 Maps::
 * Fixes regression preventing maps telemetry from populating &amp; remove task manager logic {pull}52834[#52834]
 * Categorical palettes {pull}54918[#54918]

diff --git a/docs/api/dashboard/import-dashboard.asciidoc b/docs/api/dashboard/import-dashboard.asciidoc
@@ -16,7 +16,7 @@ experimental[] Import dashboards and corresponding saved objects.
 
 `force`::
   (Optional, boolean) Overwrite any existing objects on ID conflict.
-  
+
 `exclude`::
   (Optional, array) Saved object types that you want to exclude from the import.
 
@@ -28,14 +28,14 @@ Use the complete response body from the <<dashboard-api-export, Export dashboard
 [[dashboard-api-import-response-body]]
 ==== Response body
 
-`objects`:: 
-  (array) A top level property that includes the saved objects. 
+`objects`::
+  (array) A top level property that includes the saved objects.
 
 [[dashboard-api-import-codes]]
 ==== Response code
 
 `200`::
-  Indicates a successful call, even if there are errors importing individual saved objects. If there ar errors, the error information is returned in the response body on an object-by-object basis.
+  Indicates a successful call, even if there are errors importing individual saved objects. If there are errors, the error information is returned in the response body on an object-by-object basis.
 
 [[dashboard-api-import-example]]
 ==== Example

diff --git a/docs/developer/plugin/development-plugin-resources.asciidoc b/docs/developer/plugin/development-plugin-resources.asciidoc
@@ -66,3 +66,8 @@ To enable TypeScript support, create a `tsconfig.json` file at the root of your
 TypeScript code is automatically converted into JavaScript during development,
 but not in the distributable version of Kibana. If you use the
 {repo}blob/{branch}/packages/kbn-plugin-helpers[@kbn/plugin-helpers] to build your plugin, then your `.ts` and `.tsx` files will be permanently transpiled before your plugin is archived. If you have your own build process, make sure to run the TypeScript compiler on your source files and ship the compilation output so that your plugin will work with the distributable version of Kibana.
+
+==== {kib} platform migration guide
+
+{repo}blob/{branch}/src/core/MIGRATION.md#migrating-legacy-plugins-to-the-new-platform[This guide]
+provides an action plan for moving a legacy plugin to the new platform. 
diff --git a/...lopment/core/public/kibana-plugin-public.chromenavlink.disablesuburltracking.md b/...lopment/core/public/kibana-plugin-public.chromenavlink.disablesuburltracking.md
@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeNavLink](./kibana-plugin-public.chromenavlink.md) &gt; [disableSubUrlTracking](./kibana-plugin-public.chromenavlink.disablesuburltracking.md)
+
+## ChromeNavLink.disableSubUrlTracking property
+
+> Warning: This API is now obsolete.
+> 
+> 
+
+A flag that tells legacy chrome to ignore the link when tracking sub-urls
+
+<b>Signature:</b>
+
+```typescript
+readonly disableSubUrlTracking?: boolean;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.chromenavlink.md b/docs/development/core/public/kibana-plugin-public.chromenavlink.md
@@ -18,6 +18,7 @@ export interface ChromeNavLink
 |  [active](./kibana-plugin-public.chromenavlink.active.md) | <code>boolean</code> | Indicates whether or not this app is currently on the screen. |
 |  [baseUrl](./kibana-plugin-public.chromenavlink.baseurl.md) | <code>string</code> | The base route used to open the root of an application. |
 |  [disabled](./kibana-plugin-public.chromenavlink.disabled.md) | <code>boolean</code> | Disables a link from being clickable. |
+|  [disableSubUrlTracking](./kibana-plugin-public.chromenavlink.disablesuburltracking.md) | <code>boolean</code> | A flag that tells legacy chrome to ignore the link when tracking sub-urls |
 |  [euiIconType](./kibana-plugin-public.chromenavlink.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
 |  [hidden](./kibana-plugin-public.chromenavlink.hidden.md) | <code>boolean</code> | Hides a link from the navigation. |
 |  [icon](./kibana-plugin-public.chromenavlink.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |

diff --git a/docs/migration/migrate_7_6.asciidoc b/docs/migration/migrate_7_6.asciidoc
@@ -7,13 +7,18 @@
 This page discusses the breaking changes that you need to be aware of when migrating
 your application to Kibana 7.6.
 
-* <<general-plugin-API-changes, General plugin API changes>>
-* <<move-to-new-platform-changes, Plugin API migrations to New Platform>>
+* <<user-facing-changes, Breaking changes for users>>
+* <<general-plugin-API-changes, Breaking changes for plugin developers>>
 
+[float]
+[[user-facing-changes]]
+=== Breaking changes for users
+
+There are no user-facing breaking changes in 7.6.
 
 [float]
 [[general-plugin-API-changes]]
-=== General plugin API changes
+=== Breaking changes for plugin developers
 
 [float]
 ==== {kib} no longer crashes when a plugin version does not match the server
@@ -569,10 +574,6 @@ Make the `Request` instance available to all HTTP interceptors, which is now in
 You may now also under-specify the object returned from HTTP response interceptors
 to only overwrite specific properties.
 
-[float]
-[[move-to-new-platform-changes]]
-=== Plugin API migrations to New Platform
-
 [float]
 ==== Expose whitelisted config values to client-side plugin
 {pull}50641[#50641]

diff --git a/docs/visualize/most-frequent.asciidoc b/docs/visualize/most-frequent.asciidoc
@@ -26,7 +26,6 @@ The most frequently used visualizations support the following aggregations:
 * <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
 
 * <<visualize-bucket-aggregations,Bucket>>
->>>>>>> 0ac60494d6... [DOCS] Updates to heat map page (#55097)
 
 [float]
 === Configure your visualization

diff --git a/package.json b/package.json
@@ -113,7 +113,7 @@
   "dependencies": {
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.7.0",
-    "@elastic/charts": "^16.1.0",
+    "@elastic/charts": "^16.1.3",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "7.6.0",
     "@elastic/eui": "18.2.2",
@@ -205,7 +205,7 @@
     "leaflet.heat": "0.2.0",
     "less": "^2.7.3",
     "less-loader": "5.0.0",
-    "lodash": "npm:@elastic/[email protected]kibana3",
+    "lodash": "npm:@elastic/[email protected]kibana4",
     "lodash.clonedeep": "^4.5.0",
     "lru-cache": "4.1.5",
     "markdown-it": "^10.0.0",
@@ -382,7 +382,7 @@
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
-    "chromedriver": "79.0.0",
+    "chromedriver": "^80.0.1",
     "classnames": "2.2.6",
     "dedent": "^0.7.0",
     "delete-empty": "^2.0.0",

diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "@kbn/i18n": "1.0.0",
-    "lodash": "npm:@elastic/[email protected]kibana3",
+    "lodash": "npm:@elastic/[email protected]kibana4",
     "lodash.clone": "^4.5.0",
     "uuid": "3.3.2"
   },

diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "classnames": "2.2.6",
     "focus-trap-react": "^3.1.1",
-    "lodash": "npm:@elastic/[email protected]kibana3",
+    "lodash": "npm:@elastic/[email protected]kibana4",
     "prop-types": "15.6.0",
     "react": "^16.12.0",
     "react-ace": "^5.9.0",

diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@elastic/eui": "18.2.2",
-    "@elastic/charts": "^16.1.0",
+    "@elastic/charts": "^16.1.3",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/i18n": "1.0.0",
     "@yarnpkg/lockfile": "^1.1.0",
@@ -33,4 +33,4 @@
     "webpack": "4.41.0",
     "whatwg-fetch": "^3.0.0"
   }
-}
+}
diff --git a/src/core/public/chrome/nav_links/nav_link.ts b/src/core/public/chrome/nav_links/nav_link.ts
@@ -72,6 +72,17 @@ export interface ChromeNavLink {
    */
   readonly subUrlBase?: string;
 
+  /**
+   * A flag that tells legacy chrome to ignore the link when
+   * tracking sub-urls
+   *
+   * @internalRemarks
+   * This should be removed once legacy apps are gone.
+   *
+   * @deprecated
+   */
+  readonly disableSubUrlTracking?: boolean;
+
   /**
    * Whether or not the subUrl feature should be enabled.
    *

diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
@@ -253,6 +253,8 @@ export interface ChromeNavLink {
     readonly baseUrl: string;
     // @deprecated
     readonly disabled?: boolean;
+    // @deprecated
+    readonly disableSubUrlTracking?: boolean;
     readonly euiIconType?: string;
     readonly hidden?: boolean;
     readonly icon?: string;

diff --git a/src/core/server/legacy/plugins/__snapshots__/get_nav_links.test.ts.snap b/src/core/server/legacy/plugins/__snapshots__/get_nav_links.test.ts.snap
diff --git a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
@@ -30,69 +30,8 @@ import { collectUiExports as collectLegacyUiExports } from '../../../../legacy/u
 
 import { LoggerFactory } from '../../logging';
 import { PackageInfo } from '../../config';
-
-import {
-  LegacyUiExports,
-  LegacyNavLink,
-  LegacyPluginSpec,
-  LegacyPluginPack,
-  LegacyConfig,
-} from '../types';
-
-const REMOVE_FROM_ARRAY: LegacyNavLink[] = [];
-
-function getUiAppsNavLinks({ uiAppSpecs = [] }: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]) {
-  return uiAppSpecs.flatMap(spec => {
-    if (!spec) {
-      return REMOVE_FROM_ARRAY;
-    }
-
-    const id = spec.pluginId || spec.id;
-
-    if (!id) {
-      throw new Error('Every app must specify an id');
-    }
-
-    if (spec.pluginId && !pluginSpecs.some(plugin => plugin.getId() === spec.pluginId)) {
-      throw new Error(`Unknown plugin id "${spec.pluginId}"`);
-    }
-
-    const listed = typeof spec.listed === 'boolean' ? spec.listed : true;
-
-    if (spec.hidden || !listed) {
-      return REMOVE_FROM_ARRAY;
-    }
-
-    return {
-      id,
-      title: spec.title,
-      order: typeof spec.order === 'number' ? spec.order : 0,
-      icon: spec.icon,
-      euiIconType: spec.euiIconType,
-      url: spec.url || `/app/${id}`,
-      linkToLastSubUrl: spec.linkToLastSubUrl,
-    };
-  });
-}
-
-function getNavLinks(uiExports: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]) {
-  return (uiExports.navLinkSpecs || [])
-    .map<LegacyNavLink>(spec => ({
-      id: spec.id,
-      title: spec.title,
-      order: typeof spec.order === 'number' ? spec.order : 0,
-      url: spec.url,
-      subUrlBase: spec.subUrlBase || spec.url,
-      icon: spec.icon,
-      euiIconType: spec.euiIconType,
-      linkToLastSub: 'linkToLastSubUrl' in spec ? spec.linkToLastSubUrl : false,
-      hidden: 'hidden' in spec ? spec.hidden : false,
-      disabled: 'disabled' in spec ? spec.disabled : false,
-      tooltip: spec.tooltip || '',
-    }))
-    .concat(getUiAppsNavLinks(uiExports, pluginSpecs))
-    .sort((a, b) => a.order - b.order);
-}
+import { LegacyPluginSpec, LegacyPluginPack, LegacyConfig } from '../types';
+import { getNavLinks } from './get_nav_links';
 
 export async function findLegacyPluginSpecs(
   settings: unknown,