Merge remote-tracking branch 'upstream/master' into feature-importance

# Conflicts:
#	x-pack/plugins/ml/server/routes/data_frame_analytics.ts

.eslintignore

@@ -39,7 +39,7 @@ target
 /x-pack/legacy/plugins/maps/public/vendor/**
 
 # package overrides
-/packages/eslint-config-kibana
+/packages/elastic-eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
 /packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist

.eslintrc.js

@@ -94,12 +94,6 @@ module.exports = {
  'jsx-a11y/no-onchange': 'off',
  },
  },
- {
- files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
- rules: {
- 'react-hooks/exhaustive-deps': 'off',
- },
- },
  {
  files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
  rules: {
@@ -125,25 +119,12 @@ module.exports = {
  'jsx-a11y/click-events-have-key-events': 'off',
  },
  },
- {
- files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
- rules: {
- 'react-hooks/exhaustive-deps': 'off',
- 'react-hooks/rules-of-hooks': 'off',
- },
- },
  {
  files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
  rules: {
  'react-hooks/exhaustive-deps': 'off',
  },
  },
- {
- files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
- rules: {
- 'react-hooks/exhaustive-deps': 'off',
- },
- },
 
  /**
  * Files that require Apache 2.0 headers, settings
@@ -296,10 +277,7 @@ module.exports = {
  errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
  },
  {
- target: [
- '(src|x-pack)/plugins/*/server/**/*',
- '!x-pack/plugins/apm/**/*', // https:/elastic/kibana/issues/67210
- ],
+ target: ['(src|x-pack)/plugins/*/server/**/*'],
  from: ['(src|x-pack)/plugins/*/public/**/*'],
  errorMessage: `Server code can not import from public, use a common directory.`,
  },
@@ -327,6 +305,8 @@ module.exports = {
  '!src/core/server/mocks{,.ts}',
  '!src/core/server/types{,.ts}',
  '!src/core/server/test_utils{,.ts}',
+ '!src/core/server/utils', // ts alias
+ '!src/core/server/utils/**/*',
  // for absolute imports until fixed in
  // https:/elastic/kibana/issues/36096
  '!src/core/server/*.test.mocks{,.ts}',

.github/CODEOWNERS

@@ -85,7 +85,6 @@
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 
@@ -210,8 +209,19 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
 
 # Enterprise Search
-/x-pack/plugins/enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
-/x-pack/test/functional_enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
+# Shared
+/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
+# App Search
+/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
+# Workplace Search
+/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
 
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui

.github/ISSUE_TEMPLATE/APM.md

@@ -0,0 +1,11 @@
+---
+name: APM Issue
+about: Issues related to the APM solution in Kibana
+labels: Team:apm
+title: [APM] 
+---
+
+**Versions**
+Kibana: (if relevant)
+APM Server: (if relevant)
+Elasticsearch: (if relevant)

.gitignore

@@ -60,3 +60,6 @@ apm.tsconfig.json
 # release notes script output
 report.csv
 report.asciidoc
+
+# TS incremental build cache
+*.tsbuildinfo

.telemetryrc.json

@@ -7,7 +7,6 @@
  "src/plugins/testbed/",
  "src/plugins/kibana_utils/",
  "src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts",
- "src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts",
  "src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts",
  "src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts",
  "src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts"

NOTICE.txt

@@ -281,6 +281,13 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+---
+This product includes code in the function applyCubicBezierStyles that was
+inspired by a public Codepen, which was available under a "MIT" license.
+
+Copyright (c) 2020 by Guillaume (https://codepen.io/guillaumethomas/pen/xxbbBKO)
+MIT License http://www.opensource.org/licenses/mit-license
+
 ---
 This product includes code that is adapted from mapbox-gl-js, which is
 available under a "BSD-3-Clause" license.

docs/api/saved-objects/find.asciidoc

@@ -44,7 +44,10 @@ experimental[] Retrieve a paginated set of {kib} saved objects by various condit
  (Optional, array|string) The fields to return in the `attributes` key of the response.
 
 `sort_field`::
- (Optional, string) The field that sorts the response.
+ (Optional, string) Sorts the response. Includes "root" and "type" fields. "root" fields exist for all saved objects, such as "updated_at".
+ "type" fields are specific to an object type, such as fields returned in the `attributes` key of the response. When a single type is
+ defined in the `type` parameter, the "root" and "type" fields are allowed, and validity checks are made in that order. When multiple types
+ are defined in the `type` parameter, only "root" fields are allowed.
 
 `has_reference`::
  (Optional, object) Filters to objects that have a relationship with the type and ID combination.