Merge remote-tracking branch 'upstream/master' into event-log-rename-…

…ilm-policy

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

.github/paths-labeller.yml

@@ -8,6 +8,9 @@
   - "Feature:ExpressionLanguage":
     - "src/plugins/expressions/**/*.*"
     - "src/plugins/bfetch/**/*.*"
+  - "Team:apm"
+    - "x-pack/plugins/apm/**/*.*"
+    - "x-pack/legacy/plugins/apm/**/*.*"
   - "Team:uptime":
     - "x-pack/plugins/uptime/**/*.*"
     - "x-pack/legacy/plugins/uptime/**/*.*"

.i18nrc.json

@@ -49,7 +49,7 @@
     "visTypeMarkdown": "src/plugins/vis_type_markdown",
     "visTypeMetric": "src/plugins/vis_type_metric",
     "visTypeTable": "src/plugins/vis_type_table",
-    "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
+    "visTypeTagCloud": "src/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",

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/user/reporting/automating-report-generation.asciidoc

@@ -1,32 +1,42 @@
 [role="xpack"]
 [[automating-report-generation]]
 == Automating report generation
-You can automatically generate reports with {watcher}, or by submitting
-HTTP `POST` requests from a script.
+Automatically generate PDF and CSV reports by submitting HTTP `POST` requests using {watcher} or a script.
 
 include::report-intervals.asciidoc[]
 
 [float]
-=== Get the POST URL
+=== Create a POST URL
 
-Generating a report either through {watcher} or a script requires capturing the **POST
-URL**, which is the URL to queue a report for generation.
+Create the POST
+URL that triggers a report to generate.
 
-To get the URL for triggering PDF report generation during a given time period:
+To create the POST URL for PDF reports:
 
-. Load the saved object in *Visualize* or *Dashboard*.
-. To specify a relative or absolute time period, use the time filter.
-. In the {kib} toolbar, click *Share*.
-. Select *PDF Reports*.
-. Click **Copy POST URL**.
+. Go to *Visualize* or *Dashboard*, then open the visualization or dashboard.
++
+To specify a relative or absolute time period, use the time filter.
 
-To get the URL for triggering CSV report generation during a given time period:
+. From the {kib} toolbar, click *Share*, then select *PDF Reports*.
+
+. Click *Copy POST URL*.
++
+[role="screenshot"]
+image::images/report-automate-pdf.png[Generate Visualize and Dashboard reports]
+
+
+To create the POST URL for CSV reports:
 
 . Load the saved search in *Discover*.
-. To specify a relative or absolute time period, use the time filter.
-. In the {kib} toolbar, click *Share*.
-. Select *CSV Reports*.
-. Click **Copy POST URL**.
++
+To specify a relative or absolute time period, use the time filter.
+
+. From the {kib} toolbar, click *Share*, then select *CSV Reports*.
+
+. Click *Copy POST URL*.
++
+[role="screenshot"]
+image::images/report-automate-csv.png[Generate Discover reports]
 
 [float]
 === Use Watcher

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/,
@@ -289,6 +294,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
 
     resolve: {
       extensions: ['.js', '.ts', '.tsx', '.json'],
+      mainFields: ['browser', 'main'],
       alias: {
         tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
       },

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;