Merge branch 'master' into issues/83385

.github/CODEOWNERS

@@ -16,22 +16,23 @@
 /src/plugins/discover/ @elastic/kibana-data-discovery
 /x-pack/plugins/discover_enhanced/ @elastic/kibana-data-discovery
 /test/functional/apps/discover/ @elastic/kibana-data-discovery
+/x-pack/plugins/graph/ @elastic/kibana-data-discovery
+/x-pack/test/functional/apps/graph @elastic/kibana-data-discovery
 
 # Vis Editors
 /x-pack/plugins/lens/ @elastic/kibana-vis-editors
-/x-pack/plugins/graph/ @elastic/kibana-vis-editors
 /src/plugins/advanced_settings/ @elastic/kibana-vis-editors
 /src/plugins/charts/ @elastic/kibana-vis-editors
 /src/plugins/management/ @elastic/kibana-vis-editors
 /src/plugins/kibana_legacy/ @elastic/kibana-vis-editors
 /src/plugins/timelion/ @elastic/kibana-vis-editors
 /src/plugins/vis_default_editor/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_metric/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/metric/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_table/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_tagcloud/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/tagcloud/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_timelion/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_timeseries/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_vega/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/vega/ @elastic/kibana-vis-editors
 /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

.github/workflows/sync-main-branch.yml

@@ -9,6 +9,7 @@ jobs:
   sync_latest_from_upstream:
     runs-on: ubuntu-latest
     name: Sync latest commits from master branch
+    if: github.repository == 'elastic/kibana'
 
     steps:
       - name: Checkout target repo

.i18nrc.json

@@ -60,11 +60,11 @@
     "uiActions": "src/plugins/ui_actions",
     "visDefaultEditor": "src/plugins/vis_default_editor",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",
-    "visTypeMetric": "src/plugins/vis_type_metric",
+    "visTypeMetric": "src/plugins/vis_types/metric",
     "visTypeTable": "src/plugins/vis_type_table",
-    "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
+    "visTypeTagCloud": "src/plugins/vis_types/tagcloud",
     "visTypeTimeseries": "src/plugins/vis_type_timeseries",
-    "visTypeVega": "src/plugins/vis_type_vega",
+    "visTypeVega": "src/plugins/vis_types/vega",
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",
     "visTypePie": "src/plugins/vis_types/pie",

api_docs/core.json

@@ -1125,7 +1125,7 @@
             "references": [
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/plugin.ts"
+                "path": "src/plugins/vis_types/vega/public/plugin.ts"
               }
             ]
           },
@@ -1423,15 +1423,15 @@
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/data_model/search_api.ts"
+                "path": "src/plugins/vis_types/vega/public/data_model/search_api.ts"
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/plugin.ts"
+                "path": "src/plugins/vis_types/vega/public/plugin.ts"
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts"
+                "path": "src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts"
               }
             ]
           }

api_docs/data.json

@@ -16157,11 +16157,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",
@@ -20282,15 +20282,15 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           }
         ],
         "children": [
@@ -22396,7 +22396,7 @@
             },
             {
               "plugin": "visTypeMetric",
-              "path": "src/plugins/vis_type_metric/public/plugin.ts"
+              "path": "src/plugins/vis_types/metric/public/plugin.ts"
             },
             {
               "plugin": "visTypeTable",
@@ -30417,11 +30417,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",
@@ -36898,11 +36898,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",

api_docs/deprecations_by_plugin.mdx

@@ -679,7 +679,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_metric/public/plugin.ts#:~:text=fieldFormats) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/metric/public/plugin.ts#:~:text=fieldFormats) | - |
 
 
 
@@ -738,12 +738,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata) | - |
-| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata) | - |
+| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |
 
 
 

api_docs/vis_type_vega.json

@@ -22,7 +22,7 @@
       "tags": [],
       "label": "VisTypeVegaPluginStart",
       "description": [],
-      "path": "src/plugins/vis_type_vega/server/types.ts",
+      "path": "src/plugins/vis_types/vega/server/types.ts",
       "deprecated": false,
       "children": [],
       "lifecycle": "start",
@@ -35,7 +35,7 @@
       "tags": [],
       "label": "VisTypeVegaPluginSetup",
       "description": [],
-      "path": "src/plugins/vis_type_vega/server/types.ts",
+      "path": "src/plugins/vis_types/vega/server/types.ts",
       "deprecated": false,
       "children": [],
       "lifecycle": "setup",

docs/developer/plugin-list.asciidoc

@@ -286,7 +286,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |The markdown visualization that can be used to place text panels on dashboards.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_metric[visTypeMetric]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/metric[visTypeMetric]
 |WARNING: Missing README.
 
 
@@ -298,7 +298,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |Contains the data table visualization, that allows presenting data in a simple table format.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_tagcloud[visTypeTagcloud]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/tagcloud[visTypeTagcloud]
 |WARNING: Missing README.
 
 
@@ -310,7 +310,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_vega[visTypeVega]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/vega[visTypeVega]
 |WARNING: Missing README.
 
 
@@ -350,7 +350,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/apm/readme.md[apm]
-|To access an elasticsearch instance that has live data you have two options:
+|Local setup documentation
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/banners/README.md[banners]

docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md

@@ -31,10 +31,10 @@ async function getDeprecations({ esClient, savedObjectsClient }: GetDeprecations
     // Example of a manual correctiveAction
     deprecations.push({
       title: i18n.translate('xpack.timelion.deprecations.worksheetsTitle', {
-        defaultMessage: 'Found Timelion worksheets.'
+        defaultMessage: 'Timelion worksheets are deprecated'
       }),
       message: i18n.translate('xpack.timelion.deprecations.worksheetsMessage', {
-        defaultMessage: 'You have {count} Timelion worksheets. The Timelion app will be removed in 8.0. To continue using your Timelion worksheets, migrate them to a dashboard.',
+        defaultMessage: 'You have {count} Timelion worksheets. Migrate your Timelion worksheets to a dashboard to continue using them.',
         values: { count },
       }),
       documentationUrl:

docs/management/connectors/action-types/email.asciidoc

@@ -51,7 +51,7 @@ Use the <<action-settings, Action configuration settings>> to customize connecto
 
 Config defines information for the connector type.
 
-`service`:: The name of a https://nodemailer.com/smtp/well-known/[well-known email service provider]. If `service` is provided, `host`, `port`, and `secure` properties are ignored. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
+`service`:: The name of the email service. If `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's https://nodemailer.com/smtp/well-known/[well-known email service providers], `host`, `port`, and `secure` properties are ignored. If `service` is `other`, `host` and `port` properties must be defined. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
 `from`:: An email address that corresponds to *Sender*.
 `host`:: A string that corresponds to *Host*.
 `port`:: A number that corresponds to *Port*.
@@ -107,7 +107,7 @@ For other email servers, you can check the list of well-known services that Node
 [[elasticcloud]]
 ==== Sending email from Elastic Cloud
 
-IMPORTANT: These instructions require you to link:{cloud}/ec-watcher.html#ec-watcher-whitelist[whitelist] the email addresses that notifications get sent first.
+IMPORTANT: These instructions require you to link:{cloud}/ec-watcher.html#ec-watcher-whitelist[allowlist] the email addresses that notifications get sent.
 
 Use the following connector settings to send email from Elastic Cloud: 
 

docs/settings/logging-settings.asciidoc

@@ -4,6 +4,16 @@
 <titleabbrev>Logging settings</titleabbrev>
 ++++
 
+{kib} relies on three high-level entities to set the logging service: appenders, loggers, and root.
+
+- Appenders define where log messages are displayed (stdout or console) and their layout (`pattern` or `json`). They also allow you to specify if you want the logs stored and, if so, where (file on the disk).
+- Loggers define what logging settings, such as the level of verbosity and the appenders, to apply to a particular context. Each log entry context provides information about the service or plugin that emits it and any of its sub-parts, for example, `metrics.ops` or `elasticsearch.query`.
+- Root is a logger that applies to all the log entries in {kib}.
+
+Refer to the <<log-settings-examples, examples>> for common configuration use cases. To learn more about possible configuration values, go to {kibana-ref}/logging-service.html[{kib}'s Logging service].
+
+[[log-settings-compatibility]]
+==== Backwards compatibility
 Compatibility with the legacy logging system is assured until the end of the `v7` version.
 All log messages handled by `root` context (default) are forwarded to the legacy logging service.
 The logging configuration is validated against the predefined schema and if there are
@@ -12,10 +22,12 @@ any issues with it, {kib} will fail to start with the detailed error message.
 NOTE: When you switch to the new logging configuration, you will start seeing duplicate log entries in both formats. 
 These will be removed when the `default` appender is no longer required.
 
+[[log-settings-examples]]
+==== Examples
 Here are some configuration examples for the most common logging use cases:
 
 [[log-to-file-example]]
-==== Log to a file
+===== Log to a file
 
 Log the default log format to a file instead of to stdout (the default).
 
@@ -33,10 +45,10 @@ logging:
 ----
 
 [[log-in-json-ECS-example]]
-==== Log in json format
+===== Log in JSON format
 
-Log the default log format to json layout instead of pattern (the default).
-With `json` layout log messages will be formatted as JSON strings in https://www.elastic.co/guide/en/ecs/current/ecs-reference.html[ECS format] that includes a timestamp, log level, logger, message text and any other metadata that may be associated with the log message itself
+Log the default log format to JSON layout instead of pattern (the default).
+With `json` layout, log messages will be formatted as JSON strings in https://www.elastic.co/guide/en/ecs/current/ecs-reference.html[ECS format] that includes a timestamp, log level, logger, message text and any other metadata that may be associated with the log message itself.
 
 [source,yaml]
 ----
@@ -51,7 +63,7 @@ logging:
 ----
 
 [[log-with-meta-to-stdout]]
-==== Log with meta to stdout
+===== Log with meta to stdout
 
 Include `%meta` in your pattern layout:
 
@@ -69,7 +81,7 @@ logging:
 ----
 
 [[log-elasticsearch-queries]]
-==== Log {es} queries
+===== Log {es} queries
 
 [source,yaml]
 --
@@ -89,7 +101,7 @@ logging:
 --
 
 [[change-overall-log-level]]
-==== Change overall log level.
+===== Change overall log level
 
 [source,yaml]
 ----
@@ -99,7 +111,7 @@ logging:
 ----
 
 [[customize-specific-log-records]]
-==== Customize specific log records
+===== Customize specific log records
 Here is a detailed configuration example that can be used to configure _loggers_, _appenders_ and _layouts_:
 
 [source,yaml]