Merge branch 'master' into refactor-ancestry

.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://github.com/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.`,
  },
@@ -517,7 +495,7 @@ module.exports = {
  'packages/kbn-interpreter/tasks/**/*.js',
  'packages/kbn-interpreter/src/plugin/**/*.js',
  'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*.js',
- 'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js',
+ 'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__,public}/**/*.js',
  'x-pack/**/*.test.js',
  'x-pack/test_utils/**/*',
  'x-pack/gulpfile.js',

.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
 

.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)

.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"

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.