Merge branch 'master' into duration-suffix

.github/CODEOWNERS

@@ -63,6 +63,13 @@
 /src/plugins/apm_oss/  @elastic/apm-ui
 /src/apm.js @watson @vigneshshanmugam
 
+# Client Side Monitoring (lives in APM directories but owned by Uptime)
+/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum @elastic/uptime
+/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
+/x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
+/x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
+/x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
+
 # Beats
 /x-pack/legacy/plugins/beats_management/  @elastic/beats
 

docs/apm/apm-app-users.asciidoc

@@ -84,7 +84,7 @@ Here are two examples:
 | Allow the use of the the {beat_kib_app}
 
 | Spaces
-| `Read` or `All` on Dashboards, Visualize, and Discover
+| `Read` or `All` on Dashboards and Discover
 | Allow the user to view, edit, and create dashboards, as well as browse data.
 |====
 

docs/canvas/canvas-elements.asciidoc

@@ -0,0 +1,167 @@
+[role="xpack"]
+[[add-canvas-elements]]
+=== Add elements
+
+Create a story about your data by adding elements to your workpad that include images, text, charts, and more. You can create your own elements and connect them to your data sources, add saved objects, and add your own images.
+
+[float]
+[[create-canvas-element]]
+==== Create an element
+
+Choose the type of element you want to use, then connect it to your own data.
+
+. Click *Add element*, then select the element you want to use.
++
+[role="screenshot"]
+image::images/canvas-element-select.gif[Canvas elements]
+
+. To familiarize yourself with the element, use the preconfigured data demo data.
++
+By default, most of the elements you create use demo data until you change the data source. The demo data includes a small data set that you can use to experiment with your element.
+
+. To connect the element to your data, select *Data*, then select one of the following data sources:
+
+* *{es} SQL* — Access your data in {es} using SQL syntax. For information about SQL syntax, refer to {ref}/sql-spec.html[SQL language].
+
+* *{es} documents* &mdash; Access your data in {es} without using aggregations. To use, select an index and fields, and optionally enter a query using the <<lucene-query,Lucene Query Syntax>>. Use the *{es} documents* data source when you have low volume datasets, to view raw documents, or to plot exact, non-aggregated values on a chart.
+
+* *Timelion* &mdash; Access your time series data using <<timelion,Timelion>> queries. To use Timelion queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
+
+Each element can display a different data source. Pages and workpads often contain multiple data sources.
+
+[float]
+[[canvas-add-object]]
+==== Add a saved object
+
+Add <<managing-saved-objects,saved objects>> to your workpad, such as maps and visualizations.
+
+. Click *Add element > Add from Visualize Library*.
+
+. Select the saved object you want to add.
++
+[role="screenshot"]
+image::images/canvas-map-embed.gif[]
+
+. To use the customization options, click the panel menu, then select one of the following options:
+
+* *Edit map* &mdash; Opens <<maps,Maps>> or <<create-panels,Dashboard>> so that you can edit the original saved object.
+
+* *Edit panel title* &mdash; Adds a title to the saved object.
+
+* *Customize time range* &mdash; Exposes a time filter dedicated to the saved object.
+
+* *Inspect* &mdash; Allows you to drill down into the element data.
+
+[float]
+[[canvas-add-image]]
+==== Add your own image
+
+To personalize your workpad, add your own logos and graphics.
+
+. Click *Add element > Manage assets*.
+
+. On the *Manage workpad assets* window, drag and drop your images.
+
+. To add the image to the workpad, click the *Create image element* icon.
++
+[role="screenshot"]
+image::images/canvas-add-image.gif[]
+
+[float]
+[[move-canvas-elements]]
+==== Organize elements
+
+Move and resize your elements to meet your design needs.
+
+* To move, click and hold the element, then drag to the new location.
+
+* To move by 1 pixel, select the element, press and hold Shift, then use your arrow keys.
+
+* To move by 10 pixels, select the element, then use your arrow keys.
+
+* To resize, click and drag the resize handles to the new dimensions.
+
+[float]
+[[format-canvas-elements]]
+==== Format elements
+
+For consistency and readability across your workpad pages, align, distribute, and reorder elements.
+
+To align two or more elements:
+
+. Press and hold Shift, then select the elements you want to align.
+
+. Click *Edit > Alignment*, then select the alignment option.
+
+To distribute three or more elements:
+
+. Press and hold Shift, then select the elements you want to distribute.
+
+. Click *Edit > Distribution*, then select the distribution option.
+
+To reorder elements:
+
+. Select the element you want to reorder.
+
+. Click *Edit > Order*, then select the order option.
+
+[float]
+[[data-display]]
+==== Change the element display options
+
+Each element has its own display options to fit your design needs.
+
+To choose the display options, click *Display*, then make your changes.
+
+To define the appearance of the container and border:
+
+. Next to *Element style*, click *+*, then select *Container style*.
+
+. Expand *Container style*.
+
+. Change the *Appearance* and *Border* options.
+
+To apply CSS overrides:
+
+. Next to *Element style*, click *+*, then select *CSS*.
+
+. Enter the *CSS*.
++
+For example, to center the Markdown element, enter:
++
+[source,text]
+--------------------------------------------------
+.canvasRenderEl h1 {
+text.align: center;
+}
+--------------------------------------------------
+
+. Click *Apply stylesheet*.
+
+[float]
+[[save-elements]]
+==== Save elements
+
+To use the elements across all workpads, save the elements.
+
+When you're ready to save your element, select the element, then click *Edit > Save as new element*.
+
+[role="screenshot"]
+image::images/canvas_save_element.png[]
+
+To save a group of elements, press and hold Shift, select the elements you want to save, then click *Edit > Save as new element*.
+
+To access your saved elements, click *Add element > My elements*.
+
+[float]
+[[delete-elements]]
+==== Delete elements
+
+When you no longer need an element, delete it from your workpad.
+
+. Select the element you want to delete.
+
+. Click *Edit > Delete*.
++
+[role="screenshot"]
+image::images/canvas_element_options.png[]

docs/development/core/server/kibana-plugin-core-server.appenderconfigtype.md

@@ -8,5 +8,5 @@
 <b>Signature:</b>
 
 ```typescript
-export declare type AppenderConfigType = TypeOf<typeof appendersSchema>;
+export declare type AppenderConfigType = ConsoleAppenderConfig | FileAppenderConfig | LegacyAppenderConfig;
 ```

docs/development/core/server/kibana-plugin-core-server.statusservicesetup.md

@@ -12,73 +12,10 @@ API for accessing status of Core and this plugin's dependencies as well as for c
 export interface StatusServiceSetup 
 ```
 
-## Remarks
-
-By default, a plugin inherits it's current status from the most severe status level of any Core services and any plugins that it depends on. This default status is available on the  API.
-
-Plugins may customize their status calculation by calling the  API with an Observable. Within this Observable, a plugin may choose to only depend on the status of some of its dependencies, to ignore severe status levels of particular Core services they are not concerned with, or to make its status dependent on other external services.
-
-## Example 1
-
-Customize a plugin's status to only depend on the status of SavedObjects:
-
-```ts
-core.status.set(
-  core.status.core$.pipe(
-.   map((coreStatus) => {
-      return coreStatus.savedObjects;
-    }) ;
-  );
-);
-
-```
-
-## Example 2
-
-Customize a plugin's status to include an external service:
-
-```ts
-const externalStatus$ = interval(1000).pipe(
-  switchMap(async () => {
-    const resp = await fetch(`https://myexternaldep.com/_healthz`);
-    const body = await resp.json();
-    if (body.ok) {
-      return of({ level: ServiceStatusLevels.available, summary: 'External Service is up'});
-    } else {
-      return of({ level: ServiceStatusLevels.available, summary: 'External Service is unavailable'});
-    }
-  }),
-  catchError((error) => {
-    of({ level: ServiceStatusLevels.unavailable, summary: `External Service is down`, meta: { error }})
-  })
-);
-
-core.status.set(
-  combineLatest([core.status.derivedStatus$, externalStatus$]).pipe(
-    map(([derivedStatus, externalStatus]) => {
-      if (externalStatus.level > derivedStatus) {
-        return externalStatus;
-      } else {
-        return derivedStatus;
-      }
-    })
-  )
-);
-
-```
-
 ## Properties
 
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [core$](./kibana-plugin-core-server.statusservicesetup.core_.md) | <code>Observable&lt;CoreStatus&gt;</code> | Current status for all Core services. |
-|  [dependencies$](./kibana-plugin-core-server.statusservicesetup.dependencies_.md) | <code>Observable&lt;Record&lt;string, ServiceStatus&gt;&gt;</code> | Current status for all plugins this plugin depends on. Each key of the <code>Record</code> is a plugin id. |
-|  [derivedStatus$](./kibana-plugin-core-server.statusservicesetup.derivedstatus_.md) | <code>Observable&lt;ServiceStatus&gt;</code> | The status of this plugin as derived from its dependencies. |
 |  [overall$](./kibana-plugin-core-server.statusservicesetup.overall_.md) | <code>Observable&lt;ServiceStatus&gt;</code> | Overall system status for all of Kibana. |
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [set(status$)](./kibana-plugin-core-server.statusservicesetup.set.md) | Allows a plugin to specify a custom status dependent on its own criteria. Completely overrides the default inherited status. |
-

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.es_search_strategy.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [ES\_SEARCH\_STRATEGY](./kibana-plugin-plugins-data-server.es_search_strategy.md)
+
+## ES\_SEARCH\_STRATEGY variable
+
+<b>Signature:</b>
+
+```typescript
+ES_SEARCH_STRATEGY = "es"
+```

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.md

@@ -16,5 +16,5 @@ export interface ISearchStart<SearchStrategyRequest extends IEsSearchRequest = I
 |  --- | --- | --- |
 |  [aggs](./kibana-plugin-plugins-data-server.isearchstart.aggs.md) | <code>AggsStart</code> |  |
 |  [getSearchStrategy](./kibana-plugin-plugins-data-server.isearchstart.getsearchstrategy.md) | <code>(name: string) =&gt; ISearchStrategy&lt;SearchStrategyRequest, SearchStrategyResponse&gt;</code> | Get other registered search strategies. For example, if a new strategy needs to use the already-registered ES search strategy, it can use this function to accomplish that. |
-|  [search](./kibana-plugin-plugins-data-server.isearchstart.search.md) | <code>(context: RequestHandlerContext, request: IKibanaSearchRequest, options: ISearchOptions) =&gt; Promise&lt;IKibanaSearchResponse&gt;</code> |  |
+|  [search](./kibana-plugin-plugins-data-server.isearchstart.search.md) | <code>(context: RequestHandlerContext, request: IEsSearchRequest, options: ISearchOptions) =&gt; Promise&lt;IEsSearchResponse&gt;</code> |  |
 

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.search.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-search: (context: RequestHandlerContext, request: IKibanaSearchRequest, options: ISearchOptions) => Promise<IKibanaSearchResponse>;
+search: (context: RequestHandlerContext, request: IEsSearchRequest, options: ISearchOptions) => Promise<IEsSearchResponse>;
 ```

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

@@ -71,6 +71,7 @@
 |  [AggGroupNames](./kibana-plugin-plugins-data-server.agggroupnames.md) |  |
 |  [castEsToKbnFieldTypeName](./kibana-plugin-plugins-data-server.castestokbnfieldtypename.md) | Get the KbnFieldType name for an esType string |
 |  [config](./kibana-plugin-plugins-data-server.config.md) |  |
+|  [ES\_SEARCH\_STRATEGY](./kibana-plugin-plugins-data-server.es_search_strategy.md) |  |
 |  [esFilters](./kibana-plugin-plugins-data-server.esfilters.md) |  |
 |  [esKuery](./kibana-plugin-plugins-data-server.eskuery.md) |  |
 |  [esQuery](./kibana-plugin-plugins-data-server.esquery.md) |  |