Merge branch 'master' of github.com:elastic/kibana into telemetry/mig…

…rate_public

.github/CODEOWNERS

@@ -148,6 +148,7 @@
 # Kibana Alerting Services
 /x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
 /x-pack/legacy/plugins/actions/ @elastic/kibana-alerting-services
+/x-pack/plugins/actions/ @elastic/kibana-alerting-services
 /x-pack/plugins/event_log/ @elastic/kibana-alerting-services
 /x-pack/plugins/task_manager/ @elastic/kibana-alerting-services
 /x-pack/test/alerting_api_integration/ @elastic/kibana-alerting-services

docs/apm/filters.asciidoc

@@ -45,20 +45,18 @@ Service environments are defined when configuring your APM agents.
 It's very important to be consistent when naming environments in your agents.
 See the documentation for each agent you're using to learn how to configure service environments:
 
-|===
-|*Environment configuration*
-v|*Go:* {apm-go-ref}/configuration.html#config-environment[`ELASTIC_APM_ENVIRONMENT`]
-*Java:* {apm-java-ref}/config-core.html#config-environment[`environment`]
-*Node.js:* {apm-node-ref}/configuration.html#environment[`environment`]
-*Python:* {apm-py-ref}/configuration.html#config-environment[`environment`]
-*Ruby:* {apm-ruby-ref}/configuration.html#config-environment[`environment`]
-*Real User Monitoring:* {apm-rum-ref}/configuration.html#environment[`environment`]
-|===
+* *Go:* {apm-go-ref}/configuration.html#config-environment[`ELASTIC_APM_ENVIRONMENT`]
+* *Java:* {apm-java-ref}/config-core.html#config-environment[`environment`]
+* *.NET* {apm-dotnet-ref}/config-core.html#config-environment[`Environment`]
+* *Node.js:* {apm-node-ref}/configuration.html#environment[`environment`]
+* *Python:* {apm-py-ref}/configuration.html#config-environment[`environment`]
+* *Ruby:* {apm-ruby-ref}/configuration.html#config-environment[`environment`]
+* *Real User Monitoring:* {apm-rum-ref}/configuration.html#environment[`environment`]
 
 [[contextual-filters]]
 ==== Contextual filters
 
-Local filters are ways you can filter your specific APM data on each individual page.
+Contextual filters are ways you can filter your specific APM data on each individual page.
 The filters shown are relevant to your data, and will persist between pages,
 but only where they are applicable -- they are typically most useful in their original context.
 As an example, if you select a host on the Services overview, then select a transaction group,

docs/apm/spans.asciidoc

@@ -9,7 +9,7 @@ The span timeline visualization is a bird's-eye view of what your application wa
 This makes it useful for visualizing where the selected transaction spent most of its time.
 
 [role="screenshot"]
-image::apm/images/apm-distributed-tracing.png[Example view of the distributed tracing in APM app in Kibana]
+image::apm/images/apm-transaction-sample.png[Example of distributed trace colors in the APM app in Kibana]
 
 View a span in detail by clicking on it in the timeline waterfall.
 For example, in the below screenshot we've clicked on an SQL Select database query.
@@ -35,6 +35,3 @@ These transactions can be expanded and viewed in detail by clicking on them.
 
 After exploring these traces,
 you can return to the full trace by clicking *View full trace* in the upper right hand corner of the page.
-
-[role="screenshot"]
-image::apm/images/apm-transaction-sample.png[Example of distributed trace colors in the APM app in Kibana]

docs/apm/transactions.asciidoc

@@ -2,54 +2,74 @@
 === Transaction overview
 
 TIP: A {apm-overview-ref-v}/transactions.html[transaction] describes an event captured by an Elastic APM agent instrumenting a service.
-The APM agents automatically collect performance metrics on HTTP requests, database queries, and much more.
+APM agents automatically collect performance metrics on HTTP requests, database queries, and much more.
 
 Selecting a <<services,*service*>> brings you to the *transactions* overview.
-The *time spent by span type*, *transaction duration* and *requests per minute* chart display information on all transactions associated with the selected service.
-The *Transactions* table, however, provides only a list of _transaction groups_ for the selected service.
-In other words, this view groups all transactions of the same name together, and only displays one transaction for each group.
 
 [role="screenshot"]
 image::apm/images/apm-transactions-overview.png[Example view of transactions table in the APM app in Kibana]
 
-*Time spent by span type* -- Most agents support breakdown graphs in the APM app.
-This graph is an easy way to visualize where your application is spending most of its time.
-For example, is your app spending time in external calls, database processing, or application code execution?
+The *time spent by span type*, *transaction duration*, and *requests per minute* chart display information on all transactions associated with the selected service:
 
+*Time spent by span type*::
+Visualize where your application is spending most of its time.
+For example, is your app spending time in external calls, database processing, or application code execution?
++
 The time a transaction took to complete is also recorded and displayed on the chart under the "app" label.
 "app" indicates that something was happening within the application, but we're not sure exactly what.
 This could be a sign that the agent does not have auto-instrumentation for whatever was happening during that time.
-
++
 It's important to note that if you have asynchronous spans, the sum of all span times may exceed the duration of the transaction.
 
-*Transaction duration* shows the response times for this service and is broken down into average, 95th, and 99th percentile.
+*Transaction duration*::
+Response times for this service, broken down into average, 95th, and 99th percentile.
 If there's a weird spike that you'd like to investigate,
 you can simply zoom in on the graph - this will adjust the specific time range,
 and all of the data on the page will update accordingly.
 
-*Requests per minute* is divided into response codes: 2xx, 3xx, 4xx, etc.,
+*Requests per minute*::
+Visualize response codes: `2xx`, `3xx`, `4xx`, etc.,
 and is useful for determining if you're serving more of one code than you typically do.
 Like in the Transaction duration graph, you can zoom in on anomalies to further investigate them.
 
-The *Transactions* table is similar to the <<traces,traces>> overview and shows the name of each transaction occurring in the selected service.
-Transactions with the same name are grouped together and only shown once in this table.
+[[transactions-table]]
+==== Transactions table
+
+The *Transactions* table displays a list of _transaction groups_ for the selected service.
+In other words, this view groups all transactions of the same name together,
+and only displays one entry for each group.
+
+[role="screenshot"]
+image::apm/images/apm-transactions-table.png[Example view of the transactions table in the APM app in Kibana]
+
 By default, transaction groups are sorted by _Impact_.
 Impact helps show the most used and slowest endpoints in your service - in other words,
 it's the collective amount of pain a specific endpoint is causing your users.
 If there's a particular endpoint you're worried about, you can click on it to view the <<transaction-details, transaction details>>.
 
 [IMPORTANT]
 ====
-The transaction overview will only display helpful information when the transactions in your service are named correctly.
-
-Elastic APM Agents come with built-in support for popular frameworks out-of-the-box.
-However, if you only see one route in the Transaction overview page, or if you have transactions named "unknown route",
+If you only see one route in the Transactions table, or if you have transactions named "unknown route",
 it could be a symptom that the agent either wasn't installed correctly or doesn't support your framework. 
 
 For further details, including troubleshooting and custom implementation instructions,
 refer to the documentation for each {apm-agents-ref}[APM Agent] you've implemented.
 ====
 
+[[transactions-annotations]]
+==== Transaction annotations
+
+For enhanced visibility into your deployments, we offer deployment annotations on all transaction charts.
+This feature automatically tags new deployments, so you can easily see if your deploy has increased response times
+for an end-user, or if the memory/CPU footprint of your application has increased.
+Being able to quickly identify bad deployments enables you to rollback and fix issues without causing costly outages.
+
+Deployment annotations are automatically enabled, and appear when the `service.version` of your app changes.
+
+[role="screenshot"]
+image::apm/images/apm-transaction-annotation.png[Example view of transactions annotation in the APM app in Kibana]
+
+
 [[rum-transaction-overview]]
 ==== RUM Transaction overview
 
@@ -75,23 +95,24 @@ It's important to note that all of these graphs show data from every transaction
 [role="screenshot"]
 image::apm/images/apm-transaction-response-dist.png[Example view of response time distribution]
 
-A single sampled transaction is also displayed.
-This sampled transaction is based on your selection in the *Transactions duration distribution*.
-You can update the sampled transaction by selecting a new _bucket_ in the transactions duration distribution graph.
+Up to ten sampled transactions are also displayed.
+These sampled transactions are based on your selection in the *Transactions duration distribution*.
+You can update the sampled transactions by selecting a new _bucket_ in the transactions duration distribution graph.
 The number of requests per bucket is displayed when hovering over the graph, and the selected bucket is highlighted to stand out.
 
 [role="screenshot"]
 image::apm/images/apm-transaction-duration-dist.png[Example view of transactions duration distribution graph]
 
 Let's look at an example.
 In the screenshot below,
-you'll notice most of our requests fall into buckets on the left side of the graph,
+you'll notice most of the requests fall into buckets on the left side of the graph,
 with a long tail of smaller buckets to the right.
 This is a typical distribution, and indicates most of our requests were served quickly - awesome!
 It's the requests on the right, the ones taking longer than average, that we probably want to focus on.
-By clicking on these buckets,
-we're presented with a span timeline waterfall showing what a typical request in that bucket was doing.
-By investigating this timeline waterfall, we can hopefully see why it was slow and then implement a fix.
+When you select one of these buckets,
+you're presented with up to ten trace samples.
+Each sample has a span timeline waterfall that shows what a typical request in that bucket was doing.
+By investigating this timeline waterfall, we can hopefully determine _why_ this request was slow and then implement a fix.
 
 [role="screenshot"]
 image::apm/images/apm-transaction-sample.png[Example view of transactions sample]

packages/kbn-interpreter/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "scripts": {
-    "interpreter:peg": "pegjs common/lib/grammar.peg",
+    "interpreter:peg": "pegjs src/common/lib/grammar.peg",
     "build": "node scripts/build",
     "kbn:bootstrap": "node scripts/build --dev",
     "kbn:watch": "node scripts/build --dev --watch"

packages/kbn-interpreter/src/common/lib/registry.js

@@ -31,9 +31,7 @@ export class Registry {
   }
 
   register(fn) {
-    if (typeof fn !== 'function') throw new Error(`Register requires an function`);
-
-    const obj = fn();
+    const obj = typeof fn === 'function' ? fn() : fn;
 
     if (typeof obj !== 'object' || !obj[this._prop]) {
       throw new Error(`Registered functions must return an object with a ${this._prop} property`);

packages/kbn-pm/dist/index.js

@@ -88442,7 +88442,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
-  return val.constructor ? val.constructor.name : null;
+  return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -88653,7 +88653,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
-  return val.constructor ? val.constructor.name : null;
+  return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -88844,7 +88844,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
-  return val.constructor ? val.constructor.name : null;
+  return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -101921,7 +101921,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
-  return val.constructor ? val.constructor.name : null;
+  return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {
@@ -104780,7 +104780,7 @@ module.exports = function kindOf(val) {
 };
 
 function ctorName(val) {
-  return val.constructor ? val.constructor.name : null;
+  return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
 function isArray(val) {

packages/kbn-utility-types/README.md

@@ -24,3 +24,4 @@ type B = UnwrapPromise<A>; // string
 - `ShallowPromise<T>` &mdash; Same as `Promise` type, but it flat maps the wrapped type.
 - `UnwrapObservable<T>` &mdash; Returns wrapped type of an observable.
 - `UnwrapPromise<T>` &mdash; Returns wrapped type of a promise.
+- `UnwrapPromiseOrReturn<T>` &mdash; Returns wrapped type of a promise or the type itself, if it isn't a promise.

packages/kbn-utility-types/index.ts

@@ -35,6 +35,11 @@ export type ShallowPromise<T> = T extends Promise<infer U> ? Promise<U> : Promis
  */
 export type UnwrapPromise<T extends Promise<any>> = PromiseType<T>;
 
+/**
+ * Returns wrapped type of a promise, or returns type as is, if it is not a promise.
+ */
+export type UnwrapPromiseOrReturn<T> = T extends Promise<infer U> ? U : T;
+
 /**
  * Minimal interface for an object resembling an `Observable`.
  */

src/legacy/core_plugins/data/public/search/expressions/esaggs.ts

@@ -24,7 +24,7 @@ import { createFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import {
   KibanaContext,
   KibanaDatatable,
-  ExpressionFunction,
+  ExpressionFunctionDefinition,
   KibanaDatatableColumn,
 } from 'src/plugins/expressions/public';
 import {
@@ -66,7 +66,8 @@ export interface RequestHandlerParams {
 
 const name = 'esaggs';
 
-type Context = KibanaContext | null;
+type Input = KibanaContext | null;
+type Output = Promise<KibanaDatatable>;
 
 interface Arguments {
   index: string;
@@ -76,8 +77,6 @@ interface Arguments {
   aggConfigs: string;
 }
 
-type Return = Promise<KibanaDatatable>;
-
 const handleCourierRequest = async ({
   searchSource,
   aggs,
@@ -221,12 +220,10 @@ const handleCourierRequest = async ({
   return (searchSource as any).tabifiedResponse;
 };
 
-export const esaggs = (): ExpressionFunction<typeof name, Context, Arguments, Return> => ({
+export const esaggs = (): ExpressionFunctionDefinition<typeof name, Input, Arguments, Output> => ({
   name,
   type: 'kibana_datatable',
-  context: {
-    types: ['kibana_context', 'null'],
-  },
+  inputTypes: ['kibana_context', 'null'],
   help: i18n.translate('data.functions.esaggs.help', {
     defaultMessage: 'Run AggConfig aggregation',
   }),
@@ -256,7 +253,7 @@ export const esaggs = (): ExpressionFunction<typeof name, Context, Arguments, Re
       help: '',
     },
   },
-  async fn(context, args, { inspectorAdapters, abortSignal }) {
+  async fn(input, args, { inspectorAdapters, abortSignal }) {
     const indexPatterns = getIndexPatterns();
     const { filterManager } = getQueryService();
 
@@ -272,13 +269,13 @@ export const esaggs = (): ExpressionFunction<typeof name, Context, Arguments, Re
     const response = await handleCourierRequest({
       searchSource,
       aggs,
-      timeRange: get(context, 'timeRange', undefined),
-      query: get(context, 'query', undefined),
-      filters: get(context, 'filters', undefined),
+      timeRange: get(input, 'timeRange', undefined),
+      query: get(input, 'query', undefined),
+      filters: get(input, 'filters', undefined),
       forceFetch: true,
       metricsAtAllLevels: args.metricsAtAllLevels,
       partialRows: args.partialRows,
-      inspectorAdapters,
+      inspectorAdapters: inspectorAdapters as Adapters,
       filterManager,
       abortSignal: (abortSignal as unknown) as AbortSignal,
     });

src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.ts

@@ -20,12 +20,12 @@
 import { createInputControlVisFn } from './input_control_fn';
 
 // eslint-disable-next-line
-import { functionWrapper } from '../../../../plugins/expressions/public/functions/tests/utils';
+import { functionWrapper } from '../../../../plugins/expressions/common/expression_functions/specs/tests/utils';
 
 jest.mock('./legacy_imports.ts');
 
 describe('interpreter/functions#input_control_vis', () => {
-  const fn = functionWrapper(createInputControlVisFn);
+  const fn = functionWrapper(createInputControlVisFn());
   const visConfig = {
     controls: [
       {

src/legacy/core_plugins/input_control_vis/public/input_control_fn.ts

@@ -20,15 +20,11 @@
 import { i18n } from '@kbn/i18n';
 
 import {
-  ExpressionFunction,
+  ExpressionFunctionDefinition,
   KibanaDatatable,
   Render,
 } from '../../../../plugins/expressions/public';
 
-const name = 'input_control_vis';
-
-type Context = KibanaDatatable;
-
 interface Arguments {
   visConfig: string;
 }
@@ -40,19 +36,15 @@ interface RenderValue {
   visConfig: VisParams;
 }
 
-type Return = Promise<Render<RenderValue>>;
-
-export const createInputControlVisFn = (): ExpressionFunction<
-  typeof name,
-  Context,
+export const createInputControlVisFn = (): ExpressionFunctionDefinition<
+  'input_control_vis',
+  KibanaDatatable,
   Arguments,
-  Return
+  Render<RenderValue>
 > => ({
   name: 'input_control_vis',
   type: 'render',
-  context: {
-    types: [],
-  },
+  inputTypes: [],
   help: i18n.translate('inputControl.function.help', {
     defaultMessage: 'Input control visualization',
   }),
@@ -63,7 +55,7 @@ export const createInputControlVisFn = (): ExpressionFunction<
       help: '',
     },
   },
-  async fn(context, args) {
+  fn(input, args) {
     const params = JSON.parse(args.visConfig);
     return {
       type: 'render',