Merge remote-tracking branch 'upstream/master' into runtime-field-edi…

…tor/preview-field-workstream

.eslintrc.js

@@ -446,6 +446,7 @@ module.exports = {
                   '!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
                   '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
                   '!(src|x-pack)/plugins/**/__stories__/index.{js,mjs,ts,tsx}',
+                  '!(src|x-pack)/plugins/**/__fixtures__/index.{js,mjs,ts,tsx}',
                 ],
                 allowSameFolder: true,
                 errorMessage: 'Plugins may only import from top-level public and server modules.',

.i18nrc.json

@@ -1,5 +1,6 @@
 {
   "paths": {
+    "autocomplete": "packages/kbn-securitysolution-autocomplete/src",
     "console": "src/plugins/console",
     "core": "src/core",
     "discover": "src/plugins/discover",
@@ -17,7 +18,10 @@
     "devTools": "src/plugins/dev_tools",
     "expressions": "src/plugins/expressions",
     "expressionError": "src/plugins/expression_error",
+    "expressionImage": "src/plugins/expression_image",
+    "expressionRepeatImage": "src/plugins/expression_repeat_image",
     "expressionRevealImage": "src/plugins/expression_reveal_image",
+    "expressionShape": "src/plugins/expression_shape",
     "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -28,6 +32,7 @@
     "management": ["src/legacy/core_plugins/management", "src/plugins/management"],
     "maps_legacy": "src/plugins/maps_legacy",
     "monaco": "packages/kbn-monaco/src",
+    "esQuery": "packages/kbn-es-query/src",
     "presentationUtil": "src/plugins/presentation_util",
     "indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
     "indexPatternManagement": "src/plugins/index_pattern_management",

api_docs/alerting.json

@@ -669,19 +669,19 @@
         "children": [
           {
             "parentPluginId": "alerting",
-            "id": "def-server.AlertingApiRequestHandlerContext.getAlertsClient",
+            "id": "def-server.AlertingApiRequestHandlerContext.getRulesClient",
             "type": "Function",
             "tags": [],
-            "label": "getAlertsClient",
+            "label": "getRulesClient",
             "description": [],
             "signature": [
               "() => ",
               {
                 "pluginId": "alerting",
                 "scope": "server",
                 "docId": "kibAlertingPluginApi",
-                "section": "def-server.AlertsClient",
-                "text": "AlertsClient"
+                "section": "def-server.RulesClient",
+                "text": "RulesClient"
               }
             ],
             "source": {
@@ -1170,7 +1170,7 @@
           "<Params>"
         ],
         "source": {
-          "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+          "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
           "lineNumber": 140
         },
         "deprecated": false,
@@ -1183,7 +1183,7 @@
             "label": "page",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 141
             },
             "deprecated": false
@@ -1196,7 +1196,7 @@
             "label": "perPage",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 142
             },
             "deprecated": false
@@ -1209,7 +1209,7 @@
             "label": "total",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 143
             },
             "deprecated": false
@@ -1233,7 +1233,7 @@
               "<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
             ],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 144
             },
             "deprecated": false
@@ -1343,10 +1343,10 @@
           },
           {
             "parentPluginId": "alerting",
-            "id": "def-server.PluginStartContract.getAlertsClientWithRequest",
+            "id": "def-server.PluginStartContract.getRulesClientWithRequest",
             "type": "Function",
             "tags": [],
-            "label": "getAlertsClientWithRequest",
+            "label": "getRulesClientWithRequest",
             "description": [],
             "signature": [
               "(request: ",
@@ -1362,8 +1362,8 @@
                 "pluginId": "alerting",
                 "scope": "server",
                 "docId": "kibAlertingPluginApi",
-                "section": "def-server.AlertsClient",
-                "text": "AlertsClient"
+                "section": "def-server.RulesClient",
+                "text": "RulesClient"
               },
               ", \"get\" | \"delete\" | \"create\" | \"find\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\">"
             ],
@@ -1375,7 +1375,7 @@
             "children": [
               {
                 "parentPluginId": "alerting",
-                "id": "def-server.PluginStartContract.getAlertsClientWithRequest.$1",
+                "id": "def-server.PluginStartContract.getRulesClientWithRequest.$1",
                 "type": "Object",
                 "tags": [],
                 "label": "request",
@@ -1571,10 +1571,10 @@
       },
       {
         "parentPluginId": "alerting",
-        "id": "def-server.AlertsClient",
+        "id": "def-server.RulesClient",
         "type": "Type",
         "tags": [],
-        "label": "AlertsClient",
+        "label": "RulesClient",
         "description": [],
         "signature": [
           "{ get: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<Pick<",

api_docs/deprecations.mdx

@@ -26,8 +26,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L8) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L21) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L23) | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L23) | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L98) | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L23) | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L98) | - |
 
 
 

api_docs/security.json

@@ -1739,14 +1739,14 @@
           {
             "plugin": "alerting",
             "link": {
-              "path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
               "lineNumber": 23
             }
           },
           {
             "plugin": "alerting",
             "link": {
-              "path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
               "lineNumber": 98
             }
           }

docs/canvas/canvas-edit-workpads.asciidoc

@@ -12,6 +12,7 @@ When you frequently use copy and paste, create variables to easily reuse strings
 each element instead of updating them manually.
 
 . Create the variables.
+.. Expand the *Variables* options.
 .. Click *Add a variable*. 
 .. Specify the variable options, then click *Save changes*.
 
@@ -25,12 +26,12 @@ For example, to change the index pattern for a set of charts:
 . Specify the variable options.
 +
 [role="screenshot"]
-image::images/specify_variable_syntax.png[Image describing how to specify the variable syntax]
+image::images/specify_variable_syntax.png[Variable syntax options]
 +
 . Copy the variable, then apply it to each element you want to update in the *Expression editor*.
 +
 [role="screenshot"]
-image::images/copy_variable_syntax.png[Image demonstrating expression editor]
+image::images/copy_variable_syntax.png[Copied variable syntax pasted in the Expression editor]
 
 [float]
 [[apply-changes-to-the-entire-workpad]]
@@ -84,9 +85,6 @@ To use an element with the same functionality and appearance in multiple places,
 
 Select the element, then click *Edit > Clone*. 
 
-[role="screenshot"]
-image::images/clone_element.gif[Image showing how to clone elements]
-
 [float]
 [[move-and-resize-elements]]
 ==== Move and resize elements

docs/canvas/canvas-present-workpad.asciidoc

@@ -9,16 +9,10 @@ When you are ready to present your workpad, use and enable the presentation opti
 .. From the workpad menu, click *View > Autoplay settings*.
 
 .. Under *Change cycling interval*, select the interval you want to use, or *Set a custom interval*.
-+
-[role="screenshot"]
-image::images/canvas-autoplay-interval.png[Element autoplay interval]
 
 . To enable autoplay, click *View > Turn autoplay on*.
 
 . To start your presentation, click *View > Enter fullscreen mode*.
-+
-[role="screenshot"]
-image::images/canvas-fullscreen.png[Image showing how to enter fullscreen mode from view dropdown]
 
 . When you are ready to exit fullscreen mode, press Esc.
 
@@ -31,9 +25,6 @@ To get a closer look at a portion of your workpad, use the zoom options.
 . Click *View > Zoom*.
 
 . Select the zoom option.
-+
-[role="screenshot"]
-image::images/canvas-zoom-controls.png[Zoom controls, also in view dropdown]
 
 [float]
 [[configure-auto-refresh-interval]]
@@ -45,7 +36,4 @@ Change how often the data refreshes on your workpad.
 
 . Select the interval you want to use, or *Set a custom interval*.
 +
-[role="screenshot"]
-image::images/canvas-refresh-interval.png[Element data refresh interval]
-+
 To manually refresh the data, click image:canvas/images/canvas-refresh-data.png[Canvas refresh data button].

docs/canvas/canvas-tutorial.asciidoc

@@ -9,9 +9,9 @@ To familiarize yourself with *Canvas*, add the Sample eCommerce orders data, the
 
 To create a workpad of the eCommerce store data, add the data set, then create the workpad.
 
-. On the {kib} *Home* page, click *Try our sample data*.
+. Go to the {kib} *Home* page, then click *Try our sample data*.
 
-. From *Sample eCommerce orders data*, click *Add data*.
+. On the *Sample eCommerce orders data* card, click *Add data*.
 
 . Open the main menu, then click *Canvas*.
 
@@ -26,8 +26,8 @@ To customize your workpad to look the way you want, add your own images.
 +
 The default Elastic logo image appears on the page.
 
-. To replace the Elastic logo with your own image, select the image, then use the editor.
-
+. To add your own image, click the Elastic logo, then drag the image file to the *Select or drag and drop an image* field.
++
 [role="screenshot"]
 image::images/canvas-image-element.png[Image showing how to add the image element]
 

docs/dev-tools/painlesslab/index.asciidoc

@@ -7,7 +7,7 @@ beta::[]
 The *Painless Lab* is an interactive code editor that lets you test and
 debug {ref}/modules-scripting-painless.html[Painless scripts] in real-time.
 You can use the Painless scripting
-language to create <<scripted-fields, {kib} scripted fields>>,
+language to create <<runtime-fields, {kib} runtime fields>>,
 process {ref}/docs-reindex.html[reindexed data], define complex
 <<watcher-create-advanced-watch, Watcher conditions>>,
 and work with data in other contexts.

docs/developer/advanced/running-elasticsearch.asciidoc

@@ -25,7 +25,7 @@ See all available options, like how to specify a specific license, with the `--h
 yarn es snapshot --help
 ----
 
-`trial` will give you access to all capabilities.
+`--license trial` will give you access to all capabilities.
 
 **Keeping data between snapshots**
 

docs/developer/getting-started/monorepo-packages.asciidoc

@@ -91,6 +91,7 @@ yarn kbn watch-bazel
 - @kbn/optimizer
 - @kbn/plugin-helpers
 - @kbn/rule-data-utils
+- @kbn/securitysolution-autocomplete
 - @kbn/securitysolution-es-utils
 - @kbn/securitysolution-hook-utils
 - @kbn/securitysolution-io-ts-alerting-types

docs/developer/plugin-list.asciidoc

@@ -76,6 +76,14 @@ This API doesn't support angular, for registering angular dev tools, bootstrap a
 |Expression Error plugin adds an error renderer to the expression plugin. The renderer will display the error image.
 
 
+|{kib-repo}blob/{branch}/src/plugins/expression_image/README.md[expressionImage]
+|Expression Image plugin adds an image renderer to the expression plugin. The renderer will display the given image.
+
+
+|{kib-repo}blob/{branch}/src/plugins/expression_repeat_image/README.md[expressionRepeatImage]
+|Expression Repeat Image plugin adds a repeatImage function to the expression plugin and an associated renderer. The renderer will display the given image in mutliple instances.
+
+
 |{kib-repo}blob/{branch}/src/plugins/expression_reveal_image/README.md[expressionRevealImage]
 |Expression Reveal Image plugin adds a revealImage function to the expression plugin and an associated renderer. The renderer will display the given percentage of a given image.
 
@@ -99,6 +107,10 @@ want to incorporate their own functions, types, and renderers into the service
 for use in their own application.
 
 
+|{kib-repo}blob/{branch}/src/plugins/expression_shape/README.md[expressionShape]
+|Expression Shape plugin adds a shape function to the expression plugin and an associated renderer. The renderer will display the given shape with selected decorations.
+
+
 |{kib-repo}blob/{branch}/src/plugins/home/README.md[home]
 |Moves the legacy ui/registry/feature_catalogue module for registering "features" that should be shown in the home page's feature catalogue to a service within a "home" plugin. The feature catalogue refered to here should not be confused with the "feature" plugin for registering features used to derive UI capabilities for feature controls.
 

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

@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-getSearchSourceTimeFilter(forceNow?: Date): RangeFilter[] | {
+getSearchSourceTimeFilter(forceNow?: Date): import("@kbn/es-query").RangeFilter[] | {
         meta: {
             index: string | undefined;
             params: {};
@@ -43,7 +43,7 @@ getSearchSourceTimeFilter(forceNow?: Date): RangeFilter[] | {
 
 <b>Returns:</b>
 
-`RangeFilter[] | {
+`import("@kbn/es-query").RangeFilter[] | {
         meta: {
             index: string | undefined;
             params: {};

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

@@ -4,10 +4,13 @@
 
 ## CustomFilter type
 
+> Warning: This API is now obsolete.
+> 
+> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0.
+> 
+
 <b>Signature:</b>
 
 ```typescript
-export declare type CustomFilter = Filter & {
-    query: any;
-};
+declare type CustomFilter = oldCustomFilter;
 ```

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

@@ -50,4 +50,5 @@ export declare enum ES_FIELD_TYPES
 |  TEXT | <code>&quot;text&quot;</code> |  |
 |  TOKEN\_COUNT | <code>&quot;token_count&quot;</code> |  |
 |  UNSIGNED\_LONG | <code>&quot;unsigned_long&quot;</code> |  |
+|  VERSION | <code>&quot;version&quot;</code> |  |