Merge branch 'main' into pr/jportner/121046

.backportrc.json

@@ -1,7 +1,8 @@
 {
-  "upstream": "elastic/kibana",
+  "repoOwner": "elastic",
+  "repoName": "kibana",
   "targetBranchChoices": [
-    { "name": "main", "checked": true },
+    "main",
     "8.0",
     "7.17",
     "7.16",
@@ -32,11 +33,14 @@
     "6.0",
     "5.6"
   ],
-  "targetPRLabels": ["backport"],
+  "targetPRLabels": [
+    "backport"
+  ],
   "branchLabelMapping": {
     "^v8.1.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,
-  "autoMergeMethod": "squash"
+  "autoMergeMethod": "squash",
+  "backportBinary": "node scripts/backport"
 }

.github/CODEOWNERS

@@ -163,6 +163,7 @@
 /src/plugins/input_control_vis/ @elastic/kibana-presentation
 /src/plugins/vis_type_markdown/ @elastic/kibana-presentation
 /src/plugins/presentation_util/ @elastic/kibana-presentation
+/src/plugins/controls/ @elastic/kibana-presentation
 /test/functional/apps/dashboard/  @elastic/kibana-presentation
 /test/functional/apps/dashboard_elements/  @elastic/kibana-presentation
 /x-pack/plugins/canvas/  @elastic/kibana-presentation
@@ -476,3 +477,8 @@ x-pack/test/security_solution_cypress @elastic/security-engineering-productivity
 
 # EUI design
 /src/plugins/kibana_react/public/page_template/ @elastic/eui-design @elastic/kibana-app-services
+
+# Application Experience
+
+## Shared UX
+/src/plugins/shared_ux @elastic/shared-ux

.github/workflows/backport.yml

@@ -39,6 +39,3 @@ jobs:
           github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
           commit_user: kibanamachine
           commit_email: [email protected]
-          auto_merge: 'true'
-          auto_merge_method: 'squash'
-          manual_backport_command_template: 'node scripts/backport --pr %pullNumber%'

.i18nrc.json

@@ -1,82 +1,84 @@
 {
   "paths": {
+    "advancedSettings": "src/plugins/advanced_settings",
     "alerts": "packages/kbn-alerts/src",
+    "apmOss": "src/plugins/apm_oss",
     "autocomplete": "packages/kbn-securitysolution-autocomplete/src",
-    "kbnConfig": "packages/kbn-config/src",
+    "bfetch": "src/plugins/bfetch",
+    "charts": "src/plugins/charts",
     "console": "src/plugins/console",
     "core": "src/core",
     "customIntegrations": "src/plugins/custom_integrations",
-    "discover": "src/plugins/discover",
-    "bfetch": "src/plugins/bfetch",
     "dashboard": "src/plugins/dashboard",
+    "controls": "src/plugins/controls",
     "data": "src/plugins/data",
     "dataViews": "src/plugins/data_views",
+    "devTools": "src/plugins/dev_tools",
+    "discover": "src/plugins/discover",
     "embeddableApi": "src/plugins/embeddable",
     "embeddableExamples": "examples/embeddable_examples",
-    "fieldFormats": "src/plugins/field_formats",
-    "uiActionsExamples": "examples/ui_action_examples",
-    "share": "src/plugins/share",
-    "home": "src/plugins/home",
-    "flot": "packages/kbn-ui-shared-deps-src/src/flot_charts",
-    "charts": "src/plugins/charts",
+    "esQuery": "packages/kbn-es-query/src",
     "esUi": "src/plugins/es_ui_shared",
-    "devTools": "src/plugins/dev_tools",
-    "expressions": "src/plugins/expressions",
     "expressionError": "src/plugins/expression_error",
+    "expressionGauge": "src/plugins/chart_expressions/expression_gauge",
+    "expressionHeatmap": "src/plugins/chart_expressions/expression_heatmap",
     "expressionImage": "src/plugins/expression_image",
     "expressionMetric": "src/plugins/expression_metric",
+    "expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
+    "expressionPie": "src/plugins/chart_expressions/expression_pie",
     "expressionRepeatImage": "src/plugins/expression_repeat_image",
     "expressionRevealImage": "src/plugins/expression_reveal_image",
+    "expressions": "src/plugins/expressions",
     "expressionShape": "src/plugins/expression_shape",
-    "expressionHeatmap": "src/plugins/chart_expressions/expression_heatmap",
-    "expressionGauge": "src/plugins/chart_expressions/expression_gauge",
     "expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
-    "expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
-    "expressionPie": "src/plugins/chart_expressions/expression_pie",
+    "fieldFormats": "src/plugins/field_formats",
+    "flot": "packages/kbn-ui-shared-deps-src/src/flot_charts",
+    "home": "src/plugins/home",
+    "indexPatternEditor": "src/plugins/data_view_editor",
+    "indexPatternFieldEditor": "src/plugins/data_view_field_editor",
+    "indexPatternManagement": "src/plugins/data_view_management",
     "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
+    "interactiveSetup": "src/plugins/interactive_setup",
     "interpreter": "src/legacy/core_plugins/interpreter",
     "kbn": "src/legacy/core_plugins/kibana",
+    "kbnConfig": "packages/kbn-config/src",
     "kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
+    "kibana_react": "src/legacy/core_plugins/kibana_react",
+    "kibana_utils": "src/plugins/kibana_utils",
+    "kibana-react": "src/plugins/kibana_react",
+    "kibanaOverview": "src/plugins/kibana_overview",
     "lists": "packages/kbn-securitysolution-list-utils/src",
     "management": ["src/legacy/core_plugins/management", "src/plugins/management"],
     "monaco": "packages/kbn-monaco/src",
-    "esQuery": "packages/kbn-es-query/src",
-    "presentationUtil": "src/plugins/presentation_util",
-    "indexPatternEditor": "src/plugins/data_view_editor",
-    "indexPatternFieldEditor": "src/plugins/data_view_field_editor",
-    "indexPatternManagement": "src/plugins/data_view_management",
-    "interactiveSetup": "src/plugins/interactive_setup",
-    "advancedSettings": "src/plugins/advanced_settings",
-    "kibanaOverview": "src/plugins/kibana_overview",
-    "kibana_react": "src/legacy/core_plugins/kibana_react",
-    "kibana-react": "src/plugins/kibana_react",
-    "kibana_utils": "src/plugins/kibana_utils",
     "navigation": "src/plugins/navigation",
     "newsfeed": "src/plugins/newsfeed",
+    "presentationUtil": "src/plugins/presentation_util",
     "savedObjects": "src/plugins/saved_objects",
     "savedObjectsManagement": "src/plugins/saved_objects_management",
     "server": "src/legacy/server",
+    "share": "src/plugins/share",
+    "sharedUX": "src/plugins/shared_ux",
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": ["src/plugins/telemetry", "src/plugins/telemetry_management_section"],
     "timelion": ["src/plugins/vis_types/timelion"],
     "uiActions": "src/plugins/ui_actions",
+    "uiActionsExamples": "examples/ui_action_examples",
+    "usageCollection": "src/plugins/usage_collection",
     "visDefaultEditor": "src/plugins/vis_default_editor",
+    "visTypeHeatmap": "src/plugins/vis_types/heatmap",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",
     "visTypeMetric": "src/plugins/vis_types/metric",
+    "visTypePie": "src/plugins/vis_types/pie",
     "visTypeTable": "src/plugins/vis_types/table",
     "visTypeTagCloud": "src/plugins/vis_types/tagcloud",
     "visTypeTimeseries": "src/plugins/vis_types/timeseries",
     "visTypeVega": "src/plugins/vis_types/vega",
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",
-    "visTypePie": "src/plugins/vis_types/pie",
-    "visTypeHeatmap": "src/plugins/vis_types/heatmap",
     "visualizations": "src/plugins/visualizations",
-    "visualize": "src/plugins/visualize",
-    "apmOss": "src/plugins/apm_oss",
-    "usageCollection": "src/plugins/usage_collection"
+    "visualize": "src/plugins/visualize"
   },
   "translations": []
 }

README.md

@@ -49,13 +49,13 @@ _Note: The version numbers below are only examples, meant to illustrate the rela
 
 | Situation                 | Example Kibana version     | Example ES version | Outcome |
 | ------------------------- | -------------------------- |------------------- | ------- |
-| Versions are the same.    | 5.1.2                      | 5.1.2              | 💚 OK      |
-| ES patch number is newer. | 5.1.__2__                  | 5.1.__5__          | ⚠️ Logged warning      |
-| ES minor number is newer. | 5.__1__.2                  | 5.__5__.0          | ⚠️ Logged warning      |
-| ES major number is newer. | __5__.1.2                  | __6__.0.0          | 🚫 Fatal error      |
-| ES patch number is older. | 5.1.__2__                  | 5.1.__0__          | ⚠️ Logged warning      |
-| ES minor number is older. | 5.__1__.2                  | 5.__0__.0          | 🚫 Fatal error      |
-| ES major number is older. | __5__.1.2                  | __4__.0.0          | 🚫 Fatal error      |
+| Versions are the same.    | 7.15.1                     | 7.15.1             | 💚 OK      |
+| ES patch number is newer. | 7.15.__0__                 | 7.15.__1__         | ⚠️ Logged warning      |
+| ES minor number is newer. | 7.__14__.2                 | 7.__15__.0         | ⚠️ Logged warning      |
+| ES major number is newer. | __7__.15.1                 | __8__.0.0          | 🚫 Fatal error      |
+| ES patch number is older. | 7.15.__1__                 | 7.15.__0__         | ⚠️ Logged warning      |
+| ES minor number is older. | 7.__15__.1                 | 7.__14__.2         | 🚫 Fatal error      |
+| ES major number is older. | __8__.0.0                  | __7__.15.1         | 🚫 Fatal error      |
 
 ## Questions? Problems? Suggestions?
 

docs/developer/best-practices/index.asciidoc

@@ -73,16 +73,16 @@ services you should consider:
 
 * {kib-repo}tree/{branch}/src/plugins/data/README.md[Data
 services]
-** {kib-repo}tree/{branch}/src/plugins/data/public/search/README.md[Search
+** {kib-repo}tree/{branch}/src/plugins/data/README.mdx#search[Search
 strategies]
 *** Use the `esSearchStrategy` to make raw queries to ES that will
 support async searching and partial results, as well as injecting the
 right advanced settings like whether to include frozen indices or not.
-* {kib-repo}tree/{branch}/src/plugins/embeddable/README.md[Embeddables]
+* {kib-repo}tree/{branch}/src/plugins/embeddable/README.asciidoc[Embeddables]
 ** Rendering maps, visualizations, dashboards in your application
 ** Register new widgets that will can be added to a dashboard or Canvas
 workpad, or rendered in another plugin.
-* {kib-repo}tree/{branch}/src/plugins/ui_actions/README.md[UiActions]
+* {kib-repo}tree/{branch}/src/plugins/ui_actions/README.asciidoc[UiActions]
 ** Let other plugins inject functionality into your application
 ** Inject custom functionality into other plugins
 * Stateless helper utilities

docs/developer/plugin-list.asciidoc

@@ -40,6 +40,10 @@ as uiSettings within the code.
 |Console provides the user with tools for storing and executing requests against Elasticsearch.
 
 
+|{kib-repo}blob/{branch}/src/plugins/controls/README.mdx[controls]
+|The Controls plugin contains Embeddables which can be used to add user-friendly interactivity to apps.
+
+
 |{kib-repo}blob/{branch}/src/plugins/custom_integrations/README.md[customIntegrations]
 |Register add-data cards
 
@@ -236,6 +240,10 @@ oss plugins.
 generating deep links to other apps, and creating short URLs.
 
 
+|{kib-repo}blob/{branch}/src/plugins/shared_ux/README.md[sharedUX]
+|Our mission is to make consistency in our user experience a product.
+
+
 |{kib-repo}blob/{branch}/src/plugins/telemetry/README.md[telemetry]
 |Telemetry allows Kibana features to have usage tracked in the wild. The general term "telemetry" refers to multiple things:
 

docs/settings/reporting-settings.asciidoc

@@ -50,7 +50,7 @@ xpack.reporting.encryptionKey: "something_secret"
 [[reporting-kibana-server-settings]]
 ==== {kib} server settings
 
-Reporting opens the {kib} web interface in a server process to generate
+For PNG and PDF reports, Reporting opens the {kib} web interface in a headless server process to generate
 screenshots of {kib} visualizations. In most cases, the default settings
 work and you don't need to configure the {report-features} to communicate with {kib}.
 
@@ -129,14 +129,11 @@ If capturing a report fails for any reason, {kib} will re-attempt other reportin
 `xpack.reporting.capture.loadDelay`::
 Specify the {time-units}[amount of time] before taking a screenshot when visualizations are not evented. All visualizations that ship with {kib} are evented, so this setting should not have much effect. If you are seeing empty images instead of visualizations, try increasing this value. Defaults to `3s`.
 
-[[xpack-reporting-browser]] `xpack.reporting.capture.browser.type` {ess-icon}::
-Specifies the browser to use to capture screenshots. This setting exists for backward compatibility. The only valid option is `chromium`.
-
 [float]
 [[reporting-chromium-settings]]
 ==== Chromium settings
 
-When <<xpack-reporting-browser, `xpack.reporting.capture.browser.type`>> is set to `chromium` (default) you can also specify the following settings.
+For PDF and PNG reports, Reporting spawns a headless Chromium browser process on the server to load and capture a screenshot of the {kib} app. When installing {kib} on Linux and Windows platforms, the Chromium binary comes bundled with the {kib} download. For Mac platforms, the Chromium binary is downloaded the first time {kib} is started.
 
 `xpack.reporting.capture.browser.chromium.disableSandbox`::
 It is recommended that you research the feasibility of enabling unprivileged user namespaces. An exception is if you are running {kib} in Docker because the container runs in a user namespace with the built-in seccomp/bpf filters. For more information, refer to <<reporting-chromium-sandbox>>. Defaults to `false` for all operating systems except Debian and Red Hat Linux, which use `true`.

docs/user/production-considerations/reporting-production-considerations.asciidoc

@@ -8,7 +8,15 @@
 :keywords: administrator, analyst, concept, setup, reporting
 :description: Consider the production components that are used to generate reports.
 
-To generate reports, {kib} uses a custom build of the Chromium web browser, which runs on the {kib} server in headless mode to load {kib} and capture the rendered {kib} visualizations as images. Chromium is an open-source project not related to Elastic, but the Chromium binary for {kib} has been custom-built by Elastic to make sure it works with minimal setup. The operating system that the {kib} server uses can require additional dependencies for Chromium.
+To generate reports, {kib} uses the Chromium web browser, which runs on the server in headless mode. Chromium is an open-source project not related to Elastic, and is embedded into {kib}. Chromium may require additional OS dependencies to run properly.
+
+[NOTE]
+============
+Chromium is not embedded into {kib} for the Darwin (Mac OS) architecture. When
+running on Darwin, Reporting will download Chromium into the proper area of
+the {kib} installation path the first time the server starts. To separately
+download and install the browser, see <<reporting-manual-chromium-install>>.
+============
 
 [float]
 [[reporting-chromium-sandbox]]

docs/user/reporting/reporting-troubleshooting.asciidoc

@@ -14,8 +14,8 @@ Having trouble? Here are solutions to common problems you might encounter while
 * <<reporting-troubleshooting-error-messages>>
 * <<reporting-troubleshooting-puppeteer-debug-logs>>
 * <<reporting-troubleshooting-system-requirements>>
-* <<reporting-troubleshooting-arm-systems>>
 * <<reporting-troubleshooting-maps-ems>>
+* <<reporting-manual-chromium-install>>
 
 [float]
 [[reporting-diagnostics]]
@@ -150,12 +150,6 @@ requests to render.
 If the {kib} instance doesn't have enough memory to run the report, the report fails with an error such as `Error: Page crashed!`
 In this case, try increasing the memory for the {kib} instance to 2GB.
 
-[float]
-[[reporting-troubleshooting-arm-systems]]
-=== ARM systems
-
-Chromium is not compatible with ARM RHEL.
-
 [float]
 [[reporting-troubleshooting-maps-ems]]
 === Unable to connect to Elastic Maps Service
@@ -164,3 +158,24 @@ https://www.elastic.co/elastic-maps-service[{ems} ({ems-init})] is a service tha
 tile layers and vector shapes of administrative boundaries.
 If a report contains a map with a missing basemap layer or administrative boundary, the {kib} server does not have access to {ems-init}.
 See <<maps-connect-to-ems>> for information on how to connect your {kib} server to {ems-init}.
+
+[float]
+[[reporting-manual-chromium-install]]
+=== Manually install the Chromium browser for Darwin
+Chromium is not embedded into {kib} for the Darwin (Mac OS) architecture. When
+running {kib} on Darwin, Reporting will download Chromium into the proper area of
+the {kib} installation path the first time the server starts. If the server
+does not have access to the Internet, you must download the
+Chromium browser and install it into the {kib} installation path.
+
+1. Download the Chromium zip file:
+
+** For https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/901912/chrome-mac.zip[x64] systems
+** For https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac_Arm/901913/chrome-mac.zip[ARM] systems
+
+2. Copy the zip file into the holding area. Relative to the root directory of {kib}, the path is:
+
+** `.chromium/x64` for x64 systems
+** `.chromium/arm64` for ARM systems
+
+When {kib} starts, it will automatically extract the browser from the zip file, and is then ready for PNG and PDF reports.

package.json

@@ -86,6 +86,7 @@
     "**/istanbul-lib-coverage": "^3.2.0",
     "**/json-schema": "^0.4.0",
     "**/minimist": "^1.2.5",
+    "**/node-forge": "^1.1.0",
     "**/pdfkit/crypto-js": "4.0.0",
     "**/react-syntax-highlighter": "^15.3.1",
     "**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
@@ -287,7 +288,7 @@
     "markdown-it": "^10.0.0",
     "md5": "^2.1.0",
     "mdast-util-to-hast": "10.0.1",
-    "memoize-one": "^5.0.0",
+    "memoize-one": "^6.0.0",
     "mime": "^2.4.4",
     "mime-types": "^2.1.27",
     "mini-css-extract-plugin": "1.1.0",
@@ -299,7 +300,7 @@
     "mustache": "^2.3.2",
     "nock": "12.0.3",
     "node-fetch": "^2.6.1",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.1.0",
     "nodemailer": "^6.6.2",
     "normalize-path": "^3.0.0",
     "object-hash": "^1.3.1",
@@ -611,7 +612,6 @@
     "@types/lz-string": "^1.3.34",
     "@types/markdown-it": "^0.0.7",
     "@types/md5": "^2.2.0",
-    "@types/memoize-one": "^4.1.0",
     "@types/mime": "^2.0.1",
     "@types/mime-types": "^2.1.0",
     "@types/minimatch": "^2.0.29",
@@ -624,7 +624,7 @@
     "@types/nock": "^10.0.3",
     "@types/node": "16.10.2",
     "@types/node-fetch": "^2.5.7",
-    "@types/node-forge": "^0.10.10",
+    "@types/node-forge": "^1.0.0",
     "@types/nodemailer": "^6.4.0",
     "@types/normalize-path": "^3.0.0",
     "@types/object-hash": "^1.3.0",
@@ -712,7 +712,7 @@
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-plugin-styled-components": "^2.0.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "backport": "^5.6.6",
+    "backport": "6.1.5",
     "callsites": "^3.1.0",
     "chai": "3.5.0",
     "chance": "1.0.18",

packages/kbn-optimizer/limits.yml

@@ -75,7 +75,7 @@ pageLoadAssetSize:
   watcher: 43598
   runtimeFields: 41752
   stackAlerts: 29684
-  presentationUtil: 84606
+  presentationUtil: 58834
   osquery: 107090
   fileUpload: 25664
   dataVisualizer: 27530
@@ -119,4 +119,6 @@ pageLoadAssetSize:
   visTypeHeatmap: 25340
   screenshotting: 17017
   expressionGauge: 25000
+  controls: 34788
   expressionPie: 26338
+  sharedUX: 16225

scripts/backport.js

@@ -13,4 +13,4 @@ var process = require('process');
 var args = process.argv.slice(2);
 
 var backport = require('backport');
-backport.run({}, args);
+backport.backportRun({}, args);