chore(NA): merge and solve conflicts with main

.github/CODEOWNERS

@@ -34,10 +34,12 @@
 /src/plugins/vis_types/vislib/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/xy/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/pie/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/heatmap/ @elastic/kibana-vis-editors
 /src/plugins/visualize/ @elastic/kibana-vis-editors
 /src/plugins/visualizations/ @elastic/kibana-vis-editors
 /src/plugins/chart_expressions/expression_tagcloud/ @elastic/kibana-vis-editors
 /src/plugins/chart_expressions/expression_metric/ @elastic/kibana-vis-editors
+/src/plugins/chart_expressions/expression_heatmap/ @elastic/kibana-vis-editors
 /src/plugins/url_forwarding/ @elastic/kibana-vis-editors
 /packages/kbn-tinymath/ @elastic/kibana-vis-editors
 /x-pack/test/functional/apps/lens @elastic/kibana-vis-editors

.i18nrc.json

@@ -28,6 +28,7 @@
     "expressionRepeatImage": "src/plugins/expression_repeat_image",
     "expressionRevealImage": "src/plugins/expression_reveal_image",
     "expressionShape": "src/plugins/expression_shape",
+    "expressionHeatmap": "src/plugins/chart_expressions/expression_heatmap",
     "expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
     "expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
     "inputControl": "src/plugins/input_control_vis",
@@ -69,6 +70,7 @@
     "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",

docs/concepts/data-views.asciidoc

@@ -87,11 +87,12 @@ For an example, refer to <<rollup-data-tutorial,Create and visualize rolled up d
 ==== Create a data view that searches across clusters
 
 If your {es} clusters are configured for {ref}/modules-cross-cluster-search.html[{ccs}],
-you can create a {data-source} to search across the clusters of your choosing. Use the
-same syntax that you use in a raw {ccs} request in {es}:
+you can create a {data-source} to search across the clusters of your choosing.
+You specify data streams, indices, and aliases in a remote cluster using the
+following syntax:
 
 ```ts
-<cluster-names>:<data-view>
+<remote_cluster_name>:<target>
 ```
 
 To query {ls} indices across two {es} clusters

docs/developer/contributing/development-accessibility-tests.asciidoc

@@ -90,7 +90,7 @@ Failures can seem confusing if you've never seen one before. Here is a breakdown
    [aria-hidden-focus]: Ensures aria-hidden elements do not contain focusable elements
      Help: https://dequeuniversity.com/rules/axe/3.5/aria-hidden-focus?application=axeAPI
      Elements:
-       - #example
+       - <span aria-hidden="true"><button type="button">Submit</button></span>
        at Accessibility.testAxeReport (test/accessibility/services/a11y/a11y.ts:90:15)
        at Accessibility.testAppSnapshot (test/accessibility/services/a11y/a11y.ts:58:18)
        at process._tickCallback (internal/process/next_tick.js:68:7)
@@ -100,5 +100,5 @@ Failures can seem confusing if you've never seen one before. Here is a breakdown
 * "Dashboard" and "create dashboard button" are the names of the test suite and specific test that failed.
 * Always in brackets, "[aria-hidden-focus]" is the name of the axe rule that failed, followed by a short description.
 * "Help: <url>" links to the axe documentation for that rule, including severity, remediation tips, and good and bad code examples.
-* "Elements:"  points to where in the DOM the failure originated (using CSS selector syntax). In this example, the problem came from an element with the ID `example`. If the selector is too complicated to find the source of the problem, use the browser plugins mentioned earlier to locate it. If you have a general idea where the issue is coming from, you can also try adding unique IDs to the page to narrow down the location.
+* "Elements:"  points to where in the DOM the failure originated (using HTML syntax). In this example, the problem came from a span with the `aria-hidden="true"` attribute and a nested `<button>` tag. If the selector is too complicated to find the source of the problem, use the browser plugins mentioned earlier to locate it. If you have a general idea where the issue is coming from, you can also try adding unique IDs to the page to narrow down the location.
 * The stack trace points to the internals of axe. The stack trace is there in case the test failure is a bug in axe and not in your code, although this is unlikely.

docs/developer/plugin-list.asciidoc

@@ -94,6 +94,10 @@ This API doesn't support angular, for registering angular dev tools, bootstrap a
 |Expression Error plugin adds an error renderer to the expression plugin. The renderer will display the error image.
 
 
+|{kib-repo}blob/{branch}/src/plugins/chart_expressions/expression_heatmap[expressionHeatmap]
+|WARNING: Missing README.
+
+
 |{kib-repo}blob/{branch}/src/plugins/expression_image/README.md[expressionImage]
 |Expression Image plugin adds an image renderer to the expression plugin. The renderer will display the given image.
 
@@ -274,6 +278,10 @@ It acts as a container for a particular visualization and options tabs. Contains
 The plugin exposes the static DefaultEditorController class to consume.
 
 
+|{kib-repo}blob/{branch}/src/plugins/vis_types/heatmap[visTypeHeatmap]
+|WARNING: Missing README.
+
+
 |{kib-repo}blob/{branch}/src/plugins/vis_type_markdown/README.md[visTypeMarkdown]
 |The markdown visualization that can be used to place text panels on dashboards.
 

docs/index-extra-title-page.html

@@ -63,7 +63,7 @@
               >
             </li>
             <li class="listitem">
-              <a href="https://www.elastic.co/guide/en/kibana/current/index-patterns.html"
+              <a href="https://www.elastic.co/guide/en/kibana/8.0/data-views.html"
                 >Create a data view</a
               >
             </li>

docs/management/advanced-options.asciidoc

@@ -521,7 +521,10 @@ Enables the legacy time axis for charts in Lens, Discover, Visualize and TSVB
 The maximum number of buckets a datasource can return. High numbers can have a negative impact on your browser rendering performance.
 
 [[visualization-visualize-pieChartslibrary]]`visualization:visualize:legacyPieChartsLibrary`::
-The visualize editor uses new pie charts with improved performance, color palettes, label positioning, and more. Enable this option if you prefer to use to the legacy charts library.
+The visualize editor uses new pie charts with improved performance, color palettes, label positioning, and more. Enable this option if you prefer to use the legacy charts library.
+
+[[visualization-visualize-heatmapChartslibrary]]`visualization:visualize:legacyHeatmapChartsLibrary`::
+Disable this option if you prefer to use the new heatmap charts with improved performance, legend settings, and more..
 
 [[visualize-enablelabs]]`visualize:enableLabs`::
 Enables users to create, view, and edit experimental visualizations. When disabled,

docs/redirects.asciidoc

@@ -15,6 +15,10 @@ Refer to {ref}/snapshot-restore.html[Snapshot and Restore].
 == Tutorial: Snapshot and Restore
 Refer to {ref}/snapshot-restore.html[Snapshot and Restore].
 
+[role="exclude",id="configuring-tls-communication"]
+== Encrypt communications in {kib}
+Refer to <<using-kibana-with-security,Configure security in {kib}>>.
+
 [role="exclude",id="configuring-tls"]
 == Encrypt TLS communications in {kib}
 Refer to {ref}/security-basic-setup-https.html#encrypt-kibana-http[Encrypt HTTP client communications for {kib}].

docs/user/security/securing-communications/elasticsearch-mutual-tls.asciidoc

@@ -33,8 +33,7 @@ configures {kib} to authenticate with {es} using a
 needs to map the client certificate's distinguished name (DN) to the appropriate
 `kibana_system` role.
 
-NOTE: Using a PKI realm is a gold feature. For a comparison of the Elastic
-license levels, see https://www.elastic.co/subscriptions[the subscription page].
+NOTE: Using a PKI realm is a https://www.elastic.co/subscriptions[subscription feature].
 
 [discrete]
 ==== Configure {kib} and {es} to use mutual TLS authentication

package.json

@@ -559,6 +559,7 @@
     "@types/kbn__alerts": "link:bazel-bin/packages/kbn-alerts/npm_module_types",
     "@types/kbn__analytics": "link:bazel-bin/packages/kbn-analytics/npm_module_types",
     "@types/kbn__apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader/npm_module_types",
+    "@types/kbn__apm-utils": "link:bazel-bin/packages/kbn-apm-utils/npm_module_types",
     "@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
     "@types/kbn__i18n-react": "link:bazel-bin/packages/kbn-i18n-react/npm_module_types",
     "@types/license-checker": "15.0.0",

packages/BUILD.bazel

@@ -81,6 +81,7 @@ filegroup(
       "//packages/kbn-alerts:build_types",
       "//packages/kbn-analytics:build_types",
       "//packages/kbn-apm-config-loader:build_types",
+      "//packages/kbn-apm-utils:build_types",
       "//packages/kbn-i18n:build_types",
       "//packages/kbn-i18n-react:build_types",
   ],

packages/kbn-apm-utils/BUILD.bazel

@@ -1,9 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler")
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
 
 PKG_BASE_NAME = "kbn-apm-utils"
 PKG_REQUIRE_NAME = "@kbn/apm-utils"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__apm-utils"
 
 SOURCE_FILES = glob([
   "src/index.ts",
@@ -61,7 +62,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
+  deps = RUNTIME_DEPS + [":target_node"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
@@ -80,3 +81,20 @@ filegroup(
   ],
   visibility = ["//visibility:public"],
 )
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = TYPES_PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [
+    ":npm_module_types",
+  ],
+  visibility = ["//visibility:public"],
+)

packages/kbn-apm-utils/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@kbn/apm-utils",
   "main": "./target_node/index.js",
-  "types": "./target_types/index.d.ts",
   "version": "1.0.0",
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "private": true

packages/kbn-optimizer/limits.yml

@@ -96,6 +96,7 @@ pageLoadAssetSize:
   securitySolution: 273763
   customIntegrations: 28810
   expressionMetricVis: 23121
+  expressionHeatmap: 27505
   visTypeMetric: 23332
   bfetch: 22837
   kibanaUtils: 79713
@@ -115,3 +116,4 @@ pageLoadAssetSize:
   dataViewFieldEditor: 20000
   dataViewManagement: 5000
   reporting: 57003
+  visTypeHeatmap: 25340

src/plugins/chart_expressions/expression_heatmap/common/constants.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const EXPRESSION_HEATMAP_NAME = 'heatmap';
+export const EXPRESSION_HEATMAP_LEGEND_NAME = 'heatmap_legend';
+export const EXPRESSION_HEATMAP_GRID_NAME = 'heatmap_grid';
+export const HEATMAP_FUNCTION_RENDERER_NAME = 'heatmap_renderer';