Merge branch 'master' into relevance-tuning-3

.bazelrc

@@ -11,7 +11,7 @@ import %workspace%/.bazelrc.common
 
 # BuildBuddy
 ## Metadata settings
-build --workspace_status_command=$(pwd)/src/dev/bazel_workspace_status.sh
+build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
 # Enable this in case you want to share your build info
 # build --build_metadata=VISIBILITY=PUBLIC
 build --build_metadata=TEST_GROUPS=//packages

.ci/end2end.groovy

@@ -121,9 +121,9 @@ pipeline {
 }
 
 def notifyStatus(String description, String status) {
-  withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('pipeline'))
+  withGithubStatus.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('pipeline'))
 }
 
 def notifyTestStatus(String description, String status) {
-  withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('tests'))
+  withGithubStatus.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('tests'))
 }

.ci/packer_cache_for_branch.sh

@@ -26,7 +26,6 @@ source src/dev/ci_setup/setup.sh;
 
 # download es snapshots
 node scripts/es snapshot --download-only;
-node scripts/es snapshot --license=oss --download-only;
 
 # download reporting browsers
 (cd "x-pack" && node ../node_modules/.bin/gulp downloadChromium);

.eslintrc.js

@@ -1119,6 +1119,39 @@ module.exports = {
       // All files
       files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
       rules: {
+        'import/order': [
+          'error',
+          {
+            groups: ['unknown', ['builtin', 'external'], 'internal', 'parent', 'sibling', 'index'],
+            pathGroups: [
+              {
+                pattern:
+                  '{../../../../../../,../../../../../,../../../../,../../../,../../,../}{common/,*}__mocks__{*,/**}',
+                group: 'unknown',
+              },
+              {
+                pattern: '{**,.}/*.mock',
+                group: 'unknown',
+              },
+              {
+                pattern: 'react*',
+                group: 'external',
+                position: 'before',
+              },
+              {
+                pattern: '{@elastic/**,@kbn/**,src/**}',
+                group: 'internal',
+              },
+            ],
+            pathGroupsExcludedImportTypes: [],
+            alphabetize: {
+              order: 'asc',
+              caseInsensitive: true,
+            },
+            'newlines-between': 'always-and-inside-groups',
+          },
+        ],
+        'import/newline-after-import': 'error',
         'react-hooks/exhaustive-deps': 'off',
         'react/jsx-boolean-value': ['error', 'never'],
       },

.github/CODEOWNERS

@@ -26,6 +26,7 @@
 /src/plugins/vis_type_xy/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
+/packages/kbn-tinymath/ @elastic/kibana-app
 
 # Application Services
 /examples/bfetch_explorer/ @elastic/kibana-app-services
@@ -91,6 +92,7 @@
 /src/plugins/dashboard/ @elastic/kibana-presentation
 /src/plugins/input_control_vis/ @elastic/kibana-presentation
 /src/plugins/vis_type_markdown/ @elastic/kibana-presentation
+/test/functional/apps/dashboard/  @elastic/kibana-presentation
 /x-pack/plugins/canvas/  @elastic/kibana-presentation
 /x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-presentation
@@ -149,7 +151,14 @@
 /src/cli/keystore/ @elastic/kibana-operations
 /src/legacy/server/warnings/ @elastic/kibana-operations
 /.ci/es-snapshots/ @elastic/kibana-operations
+/.github/workflows/ @elastic/kibana-operations
 /vars/ @elastic/kibana-operations
+/.bazelignore @elastic/kibana-operations
+/.bazeliskversion @elastic/kibana-operations
+/.bazelrc @elastic/kibana-operations
+/.bazelrc.common @elastic/kibana-operations
+/.bazelversion @elastic/kibana-operations
+/WORKSPACE.bazel @elastic/kibana-operations
 #CC# /packages/kbn-expect/ @elastic/kibana-operations
 
 # Quality Assurance
@@ -238,7 +247,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/test/security_api_integration/ @elastic/kibana-security
 /x-pack/test/security_functional/ @elastic/kibana-security
 /x-pack/test/spaces_api_integration/ @elastic/kibana-security
-#CC# /x-pack/plugins/security_solution/ @elastic/kibana-security
 #CC# /x-pack/plugins/security/ @elastic/kibana-security
 
 # Kibana Alerting Services
@@ -306,25 +314,22 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 #CC# /x-pack/plugins/console_extensions/ @elastic/es-ui
 #CC# /x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
 
-# Endpoint
-/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
-#CC# /x-pack/legacy/plugins/siem/ @elastic/siem
-#CC# /x-pack/plugins/siem/ @elastic/siem
-#CC# /x-pack/plugins/security_solution/ @elastic/siem
-
 # Security Solution
-/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
-/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
-/x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
-/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
-/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
-/x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
-#CC# /x-pack/plugins/security_solution/ @elastic/siem
+/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution
+/x-pack/test/security_solution_endpoint/ @elastic/security-solution
+/x-pack/test/functional/es_archives/endpoint/ @elastic/security-solution
+/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/security-solution
+/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
+/x-pack/plugins/security_solution/ @elastic/security-solution
+/x-pack/test/detection_engine_api_integration @elastic/security-solution
+/x-pack/test/lists_api_integration @elastic/security-solution
+/x-pack/test/api_integration/apis/security_solution @elastic/security-solution
+#CC# /x-pack/plugins/security_solution/ @elastic/security-solution
+
+# Security Solution sub teams
+/x-pack/plugins/case @elastic/security-threat-hunting
+/x-pack/test/case_api_integration @elastic/security-threat-hunting
+/x-pack/plugins/lists @elastic/security-detections-response
 
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
@@ -356,3 +361,4 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Reporting
 #CC# /x-pack/plugins/reporting/ @elastic/kibana-reporting-services
 
+

.github/workflows/backport.yml

@@ -0,0 +1,46 @@
+on:
+  pull_request_target:
+    branches:
+      - master
+    types:
+      - labeled
+      - closed
+
+jobs:
+  backport:
+    name: Backport PR
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'auto-backport')
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Get backport config'
+        run: |
+          curl 'https://raw.githubusercontent.com/elastic/kibana/master/.backportrc.json' > .backportrc.json
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: Install backport CLI
+        run: npm install -g backport@5.6.4
+
+      - name: Backport PR
+        run: |
+          git config --global user.name "kibanamachine"
+          git config --global user.email "42973632+kibanamachine@users.noreply.github.com"
+          backport --fork true --username kibanamachine --accessToken "${{ secrets.KIBANAMACHINE_TOKEN }}" --ci --pr "$PR_NUMBER" --labels backport --assignee "$PR_OWNER" | tee 'output.log'
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_OWNER: ${{ github.event.pull_request.user.login }}
+
+      - name: Report backport status
+        run: |
+          COMMENT="Backport result
+          \`\`\`
+          $(cat output.log)
+          \`\`\`"
+
+          GITHUB_TOKEN="${{ secrets.KIBANAMACHINE_TOKEN }}" gh api -X POST repos/elastic/kibana/issues/$PR_NUMBER/comments -F body="$COMMENT"
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}

docs/developer/contributing/development-ci-metrics.asciidoc

@@ -44,15 +44,9 @@ All metrics are collected from the `tar.gz` archive produced for the linux platf
 [[ci-metric-distributable-file-count]] `distributable file count` ::
 The number of files included in the default distributable.
 
-[[ci-metric-oss-distributable-file-count]] `oss distributable file count` ::
-The number of files included in the OSS distributable.
-
 [[ci-metric-distributable-size]] `distributable size` ::
 The size, in bytes, of the default distributable. _(not reported on PRs)_
 
-[[ci-metric-oss-distributable-size]] `oss distributable size` ::
-The size, in bytes, of the OSS distributable. _(not reported on PRs)_
-
 
 [[ci-metric-types-saved-object-field-counts]]
 ==== Saved Object field counts

docs/developer/getting-started/development-plugin-resources.asciidoc

@@ -14,8 +14,8 @@ You can use the <<automatic-plugin-generator>> to get a basic structure for a ne
 {kib} repo should be developed inside the `plugins` folder.  If you are building a new plugin to check in to the {kib} repo,
 you will choose between a few locations:
 
- - {kib-repo}tree/{branch}/x-pack/plugins[x-pack/plugins] for commercially licensed plugins
- - {kib-repo}tree/{branch}/src/plugins[src/plugins] for open source licensed plugins
+ - {kib-repo}tree/{branch}/x-pack/plugins[x-pack/plugins] for plugins related to subscription features
+ - {kib-repo}tree/{branch}/src/plugins[src/plugins] for plugins related to free features
  - {kib-repo}tree/{branch}/examples[examples] for developer example plugins (these will not be included in the distributables)
 
 [discrete]

docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.cleareditorstate.md

@@ -4,11 +4,20 @@
 
 ## EmbeddableStateTransfer.clearEditorState() method
 
+Clears the [editor state](./kibana-plugin-plugins-embeddable-public.embeddableeditorstate.md) from the sessionStorage for the provided app id
+
 <b>Signature:</b>
 
 ```typescript
-clearEditorState(): void;
+clearEditorState(appId: string): void;
 ```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  appId | <code>string</code> | The app to fetch incomingEditorState for |
+
 <b>Returns:</b>
 
 `void`

docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.getincomingeditorstate.md

@@ -4,18 +4,19 @@
 
 ## EmbeddableStateTransfer.getIncomingEditorState() method
 
-Fetches an [originating app](./kibana-plugin-plugins-embeddable-public.embeddableeditorstate.md) argument from the sessionStorage
+Fetches an [editor state](./kibana-plugin-plugins-embeddable-public.embeddableeditorstate.md) from the sessionStorage for the provided app id
 
 <b>Signature:</b>
 
 ```typescript
-getIncomingEditorState(removeAfterFetch?: boolean): EmbeddableEditorState | undefined;
+getIncomingEditorState(appId: string, removeAfterFetch?: boolean): EmbeddableEditorState | undefined;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
+|  appId | <code>string</code> | The app to fetch incomingEditorState for |
 |  removeAfterFetch | <code>boolean</code> | Whether to remove the package state after fetch to prevent duplicates. |
 
 <b>Returns:</b>

docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.getincomingembeddablepackage.md

@@ -4,18 +4,19 @@
 
 ## EmbeddableStateTransfer.getIncomingEmbeddablePackage() method
 
-Fetches an [embeddable package](./kibana-plugin-plugins-embeddable-public.embeddablepackagestate.md) argument from the sessionStorage
+Fetches an [embeddable package](./kibana-plugin-plugins-embeddable-public.embeddablepackagestate.md) from the sessionStorage for the given AppId
 
 <b>Signature:</b>
 
 ```typescript
-getIncomingEmbeddablePackage(removeAfterFetch?: boolean): EmbeddablePackageState | undefined;
+getIncomingEmbeddablePackage(appId: string, removeAfterFetch?: boolean): EmbeddablePackageState | undefined;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
+|  appId | <code>string</code> | The app to fetch EmbeddablePackageState for |
 |  removeAfterFetch | <code>boolean</code> | Whether to remove the package state after fetch to prevent duplicates. |
 
 <b>Returns:</b>

docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.md

@@ -29,9 +29,9 @@ export declare class EmbeddableStateTransfer
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [clearEditorState()](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.cleareditorstate.md) |  |  |
-|  [getIncomingEditorState(removeAfterFetch)](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.getincomingeditorstate.md) |  | Fetches an [originating app](./kibana-plugin-plugins-embeddable-public.embeddableeditorstate.md) argument from the sessionStorage |
-|  [getIncomingEmbeddablePackage(removeAfterFetch)](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.getincomingembeddablepackage.md) |  | Fetches an [embeddable package](./kibana-plugin-plugins-embeddable-public.embeddablepackagestate.md) argument from the sessionStorage |
+|  [clearEditorState(appId)](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.cleareditorstate.md) |  | Clears the [editor state](./kibana-plugin-plugins-embeddable-public.embeddableeditorstate.md) from the sessionStorage for the provided app id |
+|  [getIncomingEditorState(appId, removeAfterFetch)](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.getincomingeditorstate.md) |  | Fetches an [editor state](./kibana-plugin-plugins-embeddable-public.embeddableeditorstate.md) from the sessionStorage for the provided app id |
+|  [getIncomingEmbeddablePackage(appId, removeAfterFetch)](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.getincomingembeddablepackage.md) |  | Fetches an [embeddable package](./kibana-plugin-plugins-embeddable-public.embeddablepackagestate.md) from the sessionStorage for the given AppId |
 |  [navigateToEditor(appId, options)](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.navigatetoeditor.md) |  | A wrapper around the  method which navigates to the specified appId with [embeddable editor state](./kibana-plugin-plugins-embeddable-public.embeddableeditorstate.md) |
 |  [navigateToWithEmbeddablePackage(appId, options)](./kibana-plugin-plugins-embeddable-public.embeddablestatetransfer.navigatetowithembeddablepackage.md) |  | A wrapper around the  method which navigates to the specified appId with [embeddable package state](./kibana-plugin-plugins-embeddable-public.embeddablepackagestate.md) |
 

docs/user/alerting/geo-alert-types.asciidoc

@@ -1,19 +1,16 @@
 [role="xpack"]
-[[geo-alert-types]]
-== Geo alert types
+[[geo-alerting]]
+== Geo alerting
 
-Two additional stack alerts are available:
-<<alert-type-tracking-threshold>> and <<alert-type-tracking-containment>>.
+Alerting now includes one additional stack alert: <<alert-type-tracking-containment>>.
 
 As with other stack alerts, you need `all` access to the *Stack Alerts* feature
-to be able to create and edit either of the geo alerts.
+to be able to create and edit a geo alert.
 See <<kibana-feature-privileges, feature privileges>> for more information on configuring roles that provide access to this feature. 
 
 [float]
-=== Geo alert requirements
-
-To create either a *Tracking threshold* or a *Tracking containment* alert, the
-following requirements must be present:
+=== Geo alerting requirements
+To create a *Tracking containment* alert, the following requirements must be present:
 
 - *Tracks index or index pattern*: An index containing a `geo_point` field, `date` field,
 and some form of entity identifier. An entity identifier is a `keyword` or `number`
@@ -33,62 +30,12 @@ than the current time minus the amount of the interval. If data older than
 
 [float]
 === Creating a geo alert
-Both *threshold* and *containment* alerts can be created by clicking the *Create*
-button in the <<alert-management, alert management UI>>.
+Click the *Create* button in the <<alert-management, alert management UI>>.
 Complete the <<defining-alerts-general-details, general alert details>>.
-Select <<alert-type-tracking-threshold>> to generate an alert when an entity crosses a boundary, and you desire the
-ability to highlight lines of crossing on a custom map.
-Select
-<<alert-type-tracking-containment>> if an entity should send out constant alerts
-while contained within a boundary (this feature is optional) or if the alert is generally
-just more focused around activity when an entity exists within a shape.
 
 [role="screenshot"]
 image::images/alert-types-tracking-select.png[Choosing a tracking alert type]
 
-[NOTE]
-==================================================
-With recent advances in the alerting framework, most of the features
-available in Tracking threshold alerts can be replicated with just
-a little more work in Tracking containment alerts. The capabilities of Tracking
-threshold alerts may be deprecated or folded into Tracking containment alerts
-in the future.
-==================================================
-
-[float]
-[[alert-type-tracking-threshold]]
-=== Tracking threshold
-The Tracking threshold alert type runs an {es} query over indices, comparing the latest
-entity locations with their previous locations. In the event that an entity has crossed a
-boundary from the selected boundary index, an alert may be generated.
-
-[float]
-==== Defining the conditions
-Tracking threshold has a *Delayed evaluation offset* and 4 clauses that define the
-condition to detect, as well as 2 Kuery bars used to provide additional filtering
-context for each of the indices.
-
-[role="screenshot"]
-image::images/alert-types-tracking-threshold-conditions.png[Five clauses define the condition to detect]
-
-
-Delayed evaluation offset:: If a data source lags or is intermittent, you may supply
-an optional value to evaluate alert conditions following a fixed delay. For instance, if data
-is consistently indexed 5-10 minutes following its original timestamp, a *Delayed evaluation
-offset* of `10 minutes` would ensure that alertable instances are still captured.
-Index (entity):: This clause requires an *index or index pattern*, a *time field* that will be used for the *time window*, and a *`geo_point` field* for tracking.
-By:: This clause specifies the field to use in the previously provided
-*index or index pattern* for tracking Entities. An entity is a `keyword`
-or `number` field that consistently identifies the entity to be tracked. 
-When entity:: This clause specifies which crossing option to track. The values
-*Entered*, *Exited*, and *Crossed* can be selected to indicate which crossing conditions
-should trigger an alert. *Entered* alerts on entry into a boundary, *Exited* alerts on exit
-from a boundary, and *Crossed* alerts on all boundary crossings whether they be entrances
-or exits.
-Index (Boundary):: This clause requires an *index or index pattern*, a *`geo_shape` field*
-identifying boundaries, and an optional *Human-readable boundary name* for better alerting
-messages.
-
 [float]
 [[alert-type-tracking-containment]]
 === Tracking containment