Merge branch 'master' into add-default-for-threat-match

.browserslistrc

@@ -4,6 +4,8 @@ last 2 Chrome versions
 last 2 Safari versions
 > 0.25%
 not ie 11
+not op_mini all
+not samsung 4
 
 [dev]
 last 1 chrome versions

.eslintignore

@@ -13,6 +13,7 @@
 /x-pack/build
 node_modules
 target
+snapshots.js
 
 !/.eslintrc.js
 
@@ -22,7 +23,6 @@ target
 /src/plugins/data/common/es_query/kuery/ast/_generated_/**
 /src/plugins/vis_type_timelion/public/_generated_/**
 /x-pack/legacy/plugins/**/__tests__/fixtures/**
-/x-pack/plugins/apm/e2e/**/snapshots.js
 /x-pack/plugins/apm/e2e/tmp/*
 /x-pack/plugins/canvas/canvas_plugin
 /x-pack/plugins/canvas/shareable_runtime/build

.eslintrc.js

@@ -447,6 +447,7 @@ module.exports = {
           {
             devDependencies: false,
             peerDependencies: true,
+            packageDir: '.',
           },
         ],
       },
@@ -478,6 +479,7 @@ module.exports = {
           {
             devDependencies: true,
             peerDependencies: true,
+            packageDir: '.',
           },
         ],
       },
@@ -732,22 +734,6 @@ module.exports = {
       },
     },
 
-    /**
-     * ML overrides
-     */
-    {
-      files: ['x-pack/plugins/ml/**/*.js'],
-      rules: {
-        'no-shadow': 'error',
-        'import/no-extraneous-dependencies': [
-          'error',
-          {
-            packageDir: './x-pack',
-          },
-        ],
-      },
-    },
-
     /**
      * Security Solution overrides
      */
@@ -1149,16 +1135,11 @@ module.exports = {
           {
             devDependencies: true,
             peerDependencies: true,
+            packageDir: '.',
           },
         ],
       },
     },
-    {
-      files: ['x-pack/plugins/canvas/storybook/**'],
-      rules: {
-        'import/no-extraneous-dependencies': 0,
-      },
-    },
     {
       files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
       globals: { canvas: true, $: true },
@@ -1237,5 +1218,21 @@ module.exports = {
         ],
       },
     },
+
+    /**
+     * Single package.json rules, it tells eslint to ignore the child package.json files
+     * and look for dependencies declarations in the single and root level package.json
+     */
+    {
+      files: ['**/*.{js,mjs,ts,tsx}'],
+      rules: {
+        'import/no-extraneous-dependencies': [
+          'error',
+          {
+            packageDir: '.',
+          },
+        ],
+      },
+    },
   ],
 };

.github/CODEOWNERS

@@ -39,7 +39,6 @@
 #CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
 #CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
 #CC# /src/legacy/ui/public/state_management @elastic/kibana-app
-#CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
 
 # App Architecture
 /examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -61,7 +60,7 @@
 /src/plugins/expressions/ @elastic/kibana-app-arch
 /src/plugins/inspector/ @elastic/kibana-app-arch
 /src/plugins/kibana_react/ @elastic/kibana-app-arch
-/src/plugins/kibana_react/public/code_editor @elastic/kibana-canvas
+/src/plugins/kibana_react/public/code_editor @elastic/kibana-presentation
 /src/plugins/kibana_utils/ @elastic/kibana-app-arch
 /src/plugins/navigation/ @elastic/kibana-app-arch
 /src/plugins/share/ @elastic/kibana-app-arch
@@ -70,23 +69,10 @@
 /x-pack/plugins/data_enhanced/ @elastic/kibana-app-arch
 /x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-arch
 /x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-arch
-#CC# /src/legacy/core_plugins/kibana/public/management/ @elastic/kibana-app-arch
-#CC# /src/legacy/core_plugins/kibana/server/routes/api/management/ @elastic/kibana-app-arch
-#CC# /src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
-#CC# /src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
-#CC# /src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
-#CC# /src/legacy/core_plugins/status_page/public @elastic/kibana-app-arch
-#CC# /src/legacy/server/index_patterns/ @elastic/kibana-app-arch
-#CC# /src/legacy/ui/public/field_editor @elastic/kibana-app-arch
-#CC# /src/legacy/ui/public/management @elastic/kibana-app-arch
-#CC# /src/plugins/advanced_settings/ @elastic/kibana-app-arch
 #CC# /src/plugins/bfetch/ @elastic/kibana-app-arch
-#CC# /src/plugins/charts/ @elastic/kibana-app-arch
-#CC# /src/plugins/index_pattern_management/public/service @elastic/kibana-app-arch
+#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-arch
 #CC# /src/plugins/inspector/ @elastic/kibana-app-arch
-#CC# /src/plugins/saved_objects/ @elastic/kibana-app-arch
 #CC# /src/plugins/share/ @elastic/kibana-app-arch
-#CC# /src/plugins/vis_default_editor @elastic/kibana-app-arch
 #CC# /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
 #CC# /x-pack/plugins/drilldowns/ @elastic/kibana-app-arch
 #CC# /packages/kbn-interpreter/ @elastic/kibana-app-arch
@@ -118,19 +104,19 @@
 /x-pack/legacy/plugins/beats_management/  @elastic/beats
 #CC# /x-pack/plugins/beats_management/ @elastic/beats
 
-# Canvas
-/src/plugins/dashboard/ @elastic/kibana-canvas
-/src/plugins/input_control_vis/ @elastic/kibana-canvas
-/src/plugins/vis_type_markdown/ @elastic/kibana-canvas
-/x-pack/plugins/canvas/  @elastic/kibana-canvas
-/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-canvas
-/x-pack/test/functional/apps/canvas/  @elastic/kibana-canvas
-#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-canvas
-#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-canvas
-#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
-#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
-#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-canvas
-#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-canvas
+# Presentation
+/src/plugins/dashboard/ @elastic/kibana-presentation
+/src/plugins/input_control_vis/ @elastic/kibana-presentation
+/src/plugins/vis_type_markdown/ @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
+#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-presentation
+#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-presentation
+#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
+#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
+#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
+#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-presentation
 
 # Core UI
 # Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
@@ -171,8 +157,6 @@
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
 /x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
-#CC# /src/legacy/core_plugins/region_map @elastic/kibana-gis
-#CC# /src/legacy/core_plugins/tile_map @elastic/kibana-gis
 #CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
 #CC# /x-pack/plugins/file_upload @elastic/kibana-gis
 #CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
@@ -212,12 +196,15 @@
 
 # Platform
 /src/core/  @elastic/kibana-platform
+/src/plugins/saved_objects_tagging_oss  @elastic/kibana-platform
 /config/kibana.yml @elastic/kibana-platform
 /x-pack/plugins/features/  @elastic/kibana-platform
 /x-pack/plugins/licensing/  @elastic/kibana-platform
 /x-pack/plugins/global_search/  @elastic/kibana-platform
 /x-pack/plugins/cloud/ @elastic/kibana-platform
+/x-pack/plugins/saved_objects_tagging/ @elastic/kibana-platform
 /x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
+/x-pack/test/saved_object_tagging/ @elastic/kibana-platform
 /packages/kbn-config-schema/ @elastic/kibana-platform
 /packages/kbn-std/ @elastic/kibana-platform
 /src/legacy/server/config/ @elastic/kibana-platform
@@ -245,6 +232,7 @@
 #CC# /src/legacy/ui/public/documentation_links @elastic/kibana-platform
 #CC# /src/legacy/ui/public/autoload @elastic/kibana-platform
 #CC# /src/plugins/legacy_export/ @elastic/kibana-platform
+#CC# /src/plugins/saved_objects/ @elastic/kibana-platform
 #CC# /src/plugins/status_page/ @elastic/kibana-platform
 #CC# /src/plugins/testbed/server/ @elastic/kibana-platform
 #CC# /x-pack/legacy/plugins/xpack_main/server/ @elastic/kibana-platform

.github/ISSUE_TEMPLATE/Bug_report_security_solution.md

@@ -1,38 +1,38 @@
----
-name: Bug report for Security Solution
-about: Help us identify bugs in Elastic Security, SIEM, and Endpoint so we can fix them!
-title: '[Security Solution]'
-labels: 'Team: SecuritySolution'
----
-
-**Describe the bug:**
-
-**Kibana/Elasticsearch Stack version:**
-
-**Server OS version:**
-
-**Browser and Browser OS versions:**
-
-**Elastic Endpoint version:**
-
-**Original install method (e.g. download page, yum, from source, etc.):**
-
-**Functional Area (e.g. Endpoint management, timelines, resolver, etc.):**
-
-**Steps to reproduce:**
-
-1.
-2.
-3.
-
-**Current behavior:**
-
-**Expected behavior:**
-
-**Screenshots (if relevant):**
-
-**Errors in browser console (if relevant):**
-
-**Provide logs and/or server output (if relevant):**
-
-**Any additional context (logs, chat logs, magical formulas, etc.):**
+---
+name: Bug report for Security Solution
+about: Help us identify bugs in Elastic Security, SIEM, and Endpoint so we can fix them!
+title: '[Security Solution]'
+labels: 'bug, Team: SecuritySolution'
+---
+
+**Describe the bug:**
+
+**Kibana/Elasticsearch Stack version:**
+
+**Server OS version:**
+
+**Browser and Browser OS versions:**
+
+**Elastic Endpoint version:**
+
+**Original install method (e.g. download page, yum, from source, etc.):**
+
+**Functional Area (e.g. Endpoint management, timelines, resolver, etc.):**
+
+**Steps to reproduce:**
+
+1.
+2.
+3.
+
+**Current behavior:**
+
+**Expected behavior:**
+
+**Screenshots (if relevant):**
+
+**Errors in browser console (if relevant):**
+
+**Provide logs and/or server output (if relevant):**
+
+**Any additional context (logs, chat logs, magical formulas, etc.):**

.github/ISSUE_TEMPLATE/v8_breaking_change.md

@@ -7,6 +7,16 @@ assignees: ''
 
 ---
 
+<!-- 
+****************************************
+******* LABEL CHANGES NECESSARY ********
+****************************************
+ 
+Please add a "NeededFor:${TeamName}" label to denote the team that is
+requesting the breaking change is surfaced in the Upgrade Assistant.
+ 
+-->
+
 ## Change description
 
 **Which release will ship the breaking change?**

.github/workflows/pr-project-assigner.yml

@@ -18,4 +18,4 @@ jobs:
 
 # { "label": "Team:AppArch", "projectNumber": 37, "columnName": "Review in progress" },
 # { "label": "Feature:Lens", "projectNumber": 32, "columnName": "In progress" },
-# { "label": "Team:Canvas", "projectNumber": 38, "columnName": "Review in progress" }
+# { "label": "Feature:Canvas", "projectNumber": 38, "columnName": "Review in progress" }

.github/workflows/project-assigner.yml

@@ -11,7 +11,7 @@ jobs:
         uses: elastic/github-actions/[email protected]
         id: project_assigner
         with:
-          issue-mappings: '[{"label": "Team:AppArch", "projectNumber": 37, "columnName": "To triage"}, {"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Team:Canvas", "projectNumber": 38, "columnName": "Inbox"}]'
+          issue-mappings: '[{"label": "Team:AppArch", "projectNumber": 37, "columnName": "To triage"}, {"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"}, {"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"}]'
           ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
 
 

.gitignore

@@ -18,11 +18,21 @@ target
 .idea
 *.iml
 *.log
+
+# Ignore certain functional test runner artifacts
 /test/*/failure_debug
 /test/*/screenshots/diff
 /test/*/screenshots/failure
 /test/*/screenshots/session
 /test/*/screenshots/visual_regression_gallery.html
+
+# Ignore the same artifacts in x-pack
+/x-pack/test/*/failure_debug
+/x-pack/test/*/screenshots/diff
+/x-pack/test/*/screenshots/failure
+/x-pack/test/*/screenshots/session
+/x-pack/test/*/screenshots/visual_regression_gallery.html
+
 /html_docs
 .eslintcache
 /plugins/
@@ -56,6 +66,8 @@ npm-debug.log*
 # apm plugin
 /x-pack/plugins/apm/tsconfig.json
 apm.tsconfig.json
+## @cypress/snapshot from apm plugin
+snapshots.js
 
 # release notes script output
 report.csv

NOTICE.txt

@@ -26,6 +26,9 @@ This module was heavily inspired by the externals plugin that ships with webpack
 MIT License http://www.opensource.org/licenses/mit-license.php
 Author Tobias Koppers @sokra
 
+---
+This product has relied on ASTExplorer that is licensed under MIT.
+
 ---
 This product includes code that is based on Ace editor, which was available
 under a "BSD" license.

docs/api/saved-objects/rotate_encryption_key.asciidoc

@@ -25,7 +25,7 @@ Bulk key rotation can consume a considerable amount of resources and hence only
 `type`::
 (Optional, string) Limits encryption key rotation only to the saved objects with the specified type. By default, {kib} tries to rotate the encryption key for all saved object types that may contain encrypted attributes.
 
-`batchSize`::
+`batch_size`::
 (Optional, number) Specifies a maximum number of saved objects that {kib} can process in a single batch. Bulk key rotation is an iterative process since {kib} may not be able to fetch and process all required saved objects in one go and splits processing into consequent batches. By default, the batch size is 10000, which is also a maximum allowed value.
 
 [[saved-objects-api-rotate-encryption-key-response-body]]
@@ -91,7 +91,7 @@ In this example, key rotation is performed for all saved objects with the `alert
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST /api/encrypted_saved_objects/_rotate_key?type=alert&batchSize=5000
+$ curl -X POST /api/encrypted_saved_objects/_rotate_key?type=alert&batch_size=5000
 --------------------------------------------------
 // KIBANA