Merge branch 'master' of github.com:elastic/kibana into feat/timeline…

…-details-search-strategy # Conflicts: # x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
elastic · Sep 2, 2020 · 9c682f6 · 9c682f6
2 parents 8234506 + 0300245
commit 9c682f6
Show file tree

Hide file tree

Showing 2,852 changed files with 78,190 additions and 85,435 deletions.
diff --git a/.ci/pipeline-library/src/test/prChanges.groovy b/.ci/pipeline-library/src/test/prChanges.groovy
@@ -90,7 +90,7 @@ class PrChangesTest extends KibanaBasePipelineTest {
     props([
       githubPrs: [
         getChanges: { [
-          [filename: 'docs/developer/architecture/code-exploration.asciidoc'],
+          [filename: 'docs/developer/plugin-list.asciidoc'],
         ] },
       ],
     ])

diff --git a/.eslintignore b/.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

diff --git a/.eslintrc.js b/.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',

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,7 +8,6 @@
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
 /src/plugins/dashboard/ @elastic/kibana-app
-/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
 /src/plugins/discover/ @elastic/kibana-app
 /src/plugins/input_control_vis/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
@@ -59,7 +58,6 @@
 
 # APM
 /x-pack/plugins/apm/  @elastic/apm-ui
-/x-pack/plugins/apm/**/*.scss @elastic/observability-design
 /x-pack/test/functional/apps/apm/  @elastic/apm-ui
 /src/legacy/core_plugins/apm_oss/  @elastic/apm-ui
 /src/plugins/apm_oss/  @elastic/apm-ui
@@ -70,7 +68,6 @@
 
 # Canvas
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
-/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-canvas
 
 # Core UI
@@ -80,19 +77,14 @@
 /src/plugins/home/server/services/ @elastic/kibana-core-ui
 # Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
 /src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
-/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
 /src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
 
 # Observability UIs
 /x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/infra/**/*.scss @elastic/observability-design
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
-/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/plugins/observability/**/*.scss @elastic/observability-design
-/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 
@@ -165,14 +157,10 @@
 # Security
 /src/core/server/csp/  @elastic/kibana-security @elastic/kibana-platform
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
-/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
-/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/plugins/spaces/  @elastic/kibana-security
-/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
-/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security
 /x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
 /x-pack/test/functional/apps/security/ @elastic/kibana-security
@@ -220,13 +208,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
 /x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
 
-# Design
-**/*.scss  @elastic/kibana-design
-
 # 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
-/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
 
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui
@@ -255,7 +239,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Endpoint
 /x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
 /x-pack/test/api_integration/apis/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
@@ -265,7 +248,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Security Solution
 /x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
-/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
 /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
@@ -274,3 +256,29 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
+
+# Design (at the bottom for specificity of SASS files)
+**/*.scss  @elastic/kibana-design
+
+# Core design
+/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
+/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
+/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
+/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
+/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
+/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
+/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
+
+# Observability design
+/x-pack/plugins/apm/**/*.scss @elastic/observability-design
+/x-pack/plugins/infra/**/*.scss @elastic/observability-design
+/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
+/x-pack/plugins/observability/**/*.scss @elastic/observability-design
+
+# Ent. Search design
+/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
+
+# Security design
+/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
+/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
+
diff --git a/.github/ISSUE_TEMPLATE/APM.md b/.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)
diff --git a/.telemetryrc.json b/.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"

diff --git a/docs/api/saved-objects/find.asciidoc b/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.