Merge remote-tracking branch 'origin/master' into spacetime

elastic · May 20, 2020 · ca17d19 · ca17d19
2 parents 356e473 + a7c2db7
commit ca17d19
Show file tree

Hide file tree

Showing 918 changed files with 10,706 additions and 8,998 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -78,6 +78,7 @@
 
 # Canvas
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
+/x-pack/test/functional/apps/canvas/  @elastic/kibana-canvas
 
 # Observability UIs
 /x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui

diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
@@ -10,6 +10,9 @@
     - "src/plugins/bfetch/**/*.*"
   - "Team:apm":
     - "x-pack/plugins/apm/**/*.*"
-    - "x-pack/plugins/apm/**/*.*"
+  - "Team:Ingest Management":
+    - "x-pack/plugins/ingest_manager/**/*.*"
+    - "x-pack/test/api_integration/apis/fleet/**/*.*"
+    - "x-pack/test/epm_api_integration/**/*.*"
   - "Team:uptime":
     - "x-pack/plugins/uptime/**/*.*"
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
@@ -43,29 +43,29 @@ Changing these settings may disable features of the APM App.
 | `xpack.apm.enabled`
   | Set to `false` to disable the APM app. Defaults to `true`.
 
-| `xpack.apm.ui.enabled`
+| `xpack.apm.ui.enabled` {ess-icon}
   | Set to `false` to hide the APM app from the menu. Defaults to `true`.
 
 | `xpack.apm.ui.transactionGroupBucketSize`
   | Number of top transaction groups displayed in the APM app. Defaults to `100`.
 
-| `xpack.apm.ui.maxTraceItems`
+| `xpack.apm.ui.maxTraceItems` {ess-icon}
   | Maximum number of child items displayed when viewing trace details. Defaults to `1000`.
 
-| `apm_oss.indexPattern`
+| `apm_oss.indexPattern` {ess-icon}
   | The index pattern used for integrations with Machine Learning and Query Bar.
   It must match all apm indices. Defaults to `apm-*`.
 
-| `apm_oss.errorIndices`
+| `apm_oss.errorIndices` {ess-icon}
   | Matcher for all {apm-server-ref}/error-indices.html[error indices]. Defaults to `apm-*`.
 
 | `apm_oss.onboardingIndices`
   | Matcher for all onboarding indices. Defaults to `apm-*`.
 
-| `apm_oss.spanIndices`
+| `apm_oss.spanIndices` {ess-icon}
   | Matcher for all {apm-server-ref}/span-indices.html[span indices]. Defaults to `apm-*`.
 
-| `apm_oss.transactionIndices`
+| `apm_oss.transactionIndices` {ess-icon}
   | Matcher for all {apm-server-ref}/transaction-indices.html[transaction indices]. Defaults to `apm-*`.
 
 | `apm_oss.metricsIndices`

diff --git a/examples/alerting_example/kibana.json b/examples/alerting_example/kibana.json
@@ -2,7 +2,6 @@
   "id": "alertingExample",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["alerting_example"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["triggers_actions_ui", "charts", "data", "alerting", "actions"],

diff --git a/examples/bfetch_explorer/kibana.json b/examples/bfetch_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "bfetchExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["bfetch_explorer"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["bfetch"],

diff --git a/examples/demo_search/kibana.json b/examples/demo_search/kibana.json
@@ -2,7 +2,6 @@
   "id": "demoSearch",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["demoSearch"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["data"],

diff --git a/examples/embeddable_examples/kibana.json b/examples/embeddable_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "embeddableExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["embeddable_examples"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["embeddable"],

diff --git a/examples/embeddable_explorer/kibana.json b/examples/embeddable_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "embeddableExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["embeddable_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["uiActions", "inspector", "embeddable", "embeddableExamples"],

diff --git a/examples/search_explorer/kibana.json b/examples/search_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "searchExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["search_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["data", "demoSearch"],

diff --git a/examples/state_containers_examples/kibana.json b/examples/state_containers_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "stateContainersExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["state_containers_examples"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation", "data"],

diff --git a/examples/ui_action_examples/kibana.json b/examples/ui_action_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "uiActionsExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["ui_actions_examples"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["uiActions"],

diff --git a/examples/ui_actions_explorer/kibana.json b/examples/ui_actions_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "uiActionsExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["ui_actions_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["uiActions", "uiActionsExamples"],

diff --git a/examples/url_generators_examples/kibana.json b/examples/url_generators_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "urlGeneratorsExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["url_generators_examples"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["share"],

diff --git a/examples/url_generators_explorer/kibana.json b/examples/url_generators_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "urlGeneratorsExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["url_generators_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["share", "urlGeneratorsExamples"],

diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
@@ -1240,6 +1240,7 @@ import { npStart: { plugins } } from 'ui/new_platform';
 | `ui/filter_manager`                               | `plugins.data.filter`                                                | --                                                                                                                                   |
 | `ui/index_patterns`                               | `plugins.data.indexPatterns`                                         |
 | `import 'ui/management'`                          | `plugins.management.sections`                                        |                                                                                                                                      |
+| `import 'ui/registry/field_format_editors'`       | `plugins.indexPatternManagement.fieldFormatEditors`                                        |                                                                                                                                      |
 | `ui/registry/field_formats`                       | `plugins.data.fieldFormats`                                          |                                                                                                                                      |
 | `ui/registry/feature_catalogue`                   | `plugins.home.featureCatalogue.register`                             | Must add `home` as a dependency in your kibana.json.                                                                                 |
 | `ui/registry/vis_types`                           | `plugins.visualizations`                                       | --                                                                                                                                   |