Merge branch 'master' of github.com:elastic/kibana into pr/63849

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.md

@@ -2,21 +2,12 @@
 
 [Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md)
 
-## AggConfigOptions interface
+## AggConfigOptions type
 
 <b>Signature:</b>
 
 ```typescript
-export interface AggConfigOptions 
+export declare type AggConfigOptions = Assign<AggConfigSerialized, {
+    type: IAggType;
+}>;
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [enabled](./kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md) | <code>boolean</code> |  |
-|  [id](./kibana-plugin-plugins-data-public.aggconfigoptions.id.md) | <code>string</code> |  |
-|  [params](./kibana-plugin-plugins-data-public.aggconfigoptions.params.md) | <code>Record&lt;string, any&gt;</code> |  |
-|  [schema](./kibana-plugin-plugins-data-public.aggconfigoptions.schema.md) | <code>string</code> |  |
-|  [type](./kibana-plugin-plugins-data-public.aggconfigoptions.type.md) | <code>IAggType</code> |  |
-

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggparamtype.makeagg.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-makeAgg: (agg: TAggConfig, state?: any) => TAggConfig;
+makeAgg: (agg: TAggConfig, state?: AggConfigSerialized) => TAggConfig;
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggparamtype.md

@@ -21,5 +21,5 @@ export declare class AggParamType<TAggConfig extends IAggConfig = IAggConfig> ex
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
 |  [allowedAggs](./kibana-plugin-plugins-data-public.aggparamtype.allowedaggs.md) |  | <code>string[]</code> |  |
-|  [makeAgg](./kibana-plugin-plugins-data-public.aggparamtype.makeagg.md) |  | <code>(agg: TAggConfig, state?: any) =&gt; TAggConfig</code> |  |
+|  [makeAgg](./kibana-plugin-plugins-data-public.aggparamtype.makeagg.md) |  | <code>(agg: TAggConfig, state?: AggConfigSerialized) =&gt; TAggConfig</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md

@@ -49,7 +49,6 @@
 
 |  Interface | Description |
 |  --- | --- |
-|  [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) |  |
 |  [AggParamOption](./kibana-plugin-plugins-data-public.aggparamoption.md) |  |
 |  [DataPublicPluginSetup](./kibana-plugin-plugins-data-public.datapublicpluginsetup.md) |  |
 |  [DataPublicPluginStart](./kibana-plugin-plugins-data-public.datapublicpluginstart.md) |  |
@@ -118,6 +117,7 @@
 
 |  Type Alias | Description |
 |  --- | --- |
+|  [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) |  |
 |  [AggParam](./kibana-plugin-plugins-data-public.aggparam.md) |  |
 |  [CustomFilter](./kibana-plugin-plugins-data-public.customfilter.md) |  |
 |  [EsQuerySortValue](./kibana-plugin-plugins-data-public.esquerysortvalue.md) |  |

docs/user/alerting/pre-configured-connectors.asciidoc

@@ -20,8 +20,7 @@ action are predefined, including the connector name and ID.
 
 The following example shows a valid configuration 2 out-of-the box connector.
 
-[source,console]
-------------------------
+```js
   xpack.actions.preconfigured:
     - id: 'my-slack1'           <1>
       actionTypeId: .slack      <2>
@@ -40,7 +39,7 @@ The following example shows a valid configuration 2 out-of-the box connector.
       secrets:                  <5>
         user: elastic
         password: changeme
-------------------------
+```
 
 <1> `id` is the action connector identifier.
 <2> `actionTypeId` is the action type identifier.

docs/visualize/lens.asciidoc

@@ -14,20 +14,6 @@ beta[]
 
 * Save your visualization for use in a dashboard.
 
-[float]
-[[lens-aggregation]]
-=== Supported aggregations
-
-Lens supports the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-
-* <<visualize-bucket-aggregations,Bucket>>
-
 [float]
 [[drag-drop]]
 === Drag and drop

docs/visualize/most-frequent.asciidoc

@@ -13,20 +13,6 @@ The most frequently used visualizations include:
 
 [[metric-chart]]
 
-[float]
-[[frequently-used-viz-aggregation]]
-=== Supported aggregations
-
-The most frequently used visualizations support the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-
-* <<visualize-bucket-aggregations,Bucket>>
-
 [float]
 === Configure your visualization
 

docs/visualize/tilemap.asciidoc

@@ -6,19 +6,6 @@ Display graphical representations of data where the individual values are repres
 [role="screenshot"]
 image::images/visualize_heat_map_example.png[]
 
-[float]
-[[build-heat-map]]
-=== Build a heat map
-
-To display your data on the heat map, use the supported aggregations.
-
-Heat maps support the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-* <<visualize-bucket-aggregations,Bucket>>
-
 [float]
 [[navigate-heatmap]]
 === Change the color ranges

docs/visualize/tsvb.asciidoc

@@ -43,18 +43,6 @@ Table:: Display data from multiple time series by defining the field group to sh
 [role="screenshot"]
 image:images/tsvb-table.png["Table visualization"]
 
-[float]
-[[tsvb-aggregation]]
-=== Supported aggregations
-
-TSVB supports the following aggregations:
-
-* <<visualize-metric-aggregations,Metric>>
-
-* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
-
-* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
-
 [float]
 [[create-tsvb-visualization]]
 === Create TSVB visualizations

package.json

@@ -120,7 +120,7 @@
     "@babel/core": "^7.9.0",
     "@babel/register": "^7.9.0",
     "@elastic/apm-rum": "^5.1.1",
-    "@elastic/charts": "18.3.0",
+    "@elastic/charts": "18.4.1",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.8.0",
     "@elastic/eui": "22.3.0",

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -34,7 +34,6 @@ import { Bundle, WorkerConfig, parseDirPath, DisallowedSyntaxPlugin } from '../c
 
 const IS_CODE_COVERAGE = !!process.env.CODE_COVERAGE;
 const ISTANBUL_PRESET_PATH = require.resolve('@kbn/babel-preset/istanbul_preset');
-const PUBLIC_PATH_PLACEHOLDER = '__REPLACE_WITH_PUBLIC_PATH__';
 const BABEL_PRESET_PATH = require.resolve('@kbn/babel-preset/webpack_preset');
 
 const STATIC_BUNDLE_PLUGINS = [
@@ -105,7 +104,6 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
     output: {
       path: bundle.outputDir,
       filename: `[name].${bundle.type}.js`,
-      publicPath: PUBLIC_PATH_PLACEHOLDER,
       devtoolModuleFilenameTemplate: info =>
         `/${bundle.type}:${bundle.id}/${Path.relative(
           bundle.sourceRoot,
@@ -146,6 +144,13 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
       ],
 
       rules: [
+        {
+          include: Path.join(bundle.contextDir, bundle.entry),
+          loader: UiSharedDeps.publicPathLoader,
+          options: {
+            key: bundle.id,
+          },
+        },
         {
           test: /\.css$/,
           include: /node_modules/,

packages/kbn-ui-shared-deps/index.d.ts

@@ -53,3 +53,8 @@ export const lightCssDistFilename: string;
 export const externals: {
   [key: string]: string;
 };
+
+/**
+ * Webpack loader for configuring the public path lookup from `window.__kbnPublicPath__`.
+ */
+export const publicPathLoader: string;

packages/kbn-ui-shared-deps/index.js

@@ -64,3 +64,4 @@ exports.externals = {
   'elasticsearch-browser': '__kbnSharedDeps__.ElasticsearchBrowser',
   'elasticsearch-browser/elasticsearch': '__kbnSharedDeps__.ElasticsearchBrowser',
 };
+exports.publicPathLoader = require.resolve('./public_path_loader');

packages/kbn-ui-shared-deps/package.json

@@ -9,7 +9,7 @@
     "kbn:watch": "node scripts/build --watch"
   },
   "dependencies": {
-    "@elastic/charts": "18.3.0",
+    "@elastic/charts": "18.4.1",
     "@elastic/eui": "22.3.0",
     "@kbn/i18n": "1.0.0",
     "abortcontroller-polyfill": "^1.4.0",

packages/kbn-ui-shared-deps/public_path_loader.js

@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = function(source) {
+  const options = this.query;
+  return `__webpack_public_path__ = window.__kbnPublicPath__['${options.key}'];${source}`;
+};

packages/kbn-ui-shared-deps/webpack.config.js

@@ -46,7 +46,6 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
     path: UiSharedDeps.distDir,
     filename: '[name].js',
     sourceMapFilename: '[file].map',
-    publicPath: '__REPLACE_WITH_PUBLIC_PATH__',
     devtoolModuleFilenameTemplate: info =>
       `kbn-ui-shared-deps/${Path.relative(REPO_ROOT, info.absoluteResourcePath)}`,
     library: '__kbnSharedDeps__',
@@ -55,6 +54,17 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
   module: {
     noParse: [MOMENT_SRC],
     rules: [
+      {
+        include: [require.resolve('./entry.js')],
+        use: [
+          {
+            loader: UiSharedDeps.publicPathLoader,
+            options: {
+              key: 'kbn-ui-shared-deps',
+            },
+          },
+        ],
+      },
       {
         test: /\.css$/,
         use: [MiniCssExtractPlugin.loader, 'css-loader'],

src/legacy/core_plugins/tests_bundle/index.js

@@ -148,6 +148,19 @@ export default kibana => {
               .type('text/css');
           },
         });
+
+        // Sets global variables normally set by the bootstrap.js script
+        kbnServer.server.route({
+          path: '/test_bundle/karma/globals.js',
+          method: 'GET',
+          async handler(req, h) {
+            const basePath = config.get('server.basePath');
+
+            const file = `window.__kbnPublicPath__ = { 'kbn-ui-shared-deps': "${basePath}/bundles/kbn-ui-shared-deps/" };`;
+
+            return h.response(file).header('content-type', 'application/json');
+          },
+        });
       },
 
       __globalImportAliases__: {