Merge branch 'master' of github.com:elastic/kibana into apikey-metadata

.github/CODEOWNERS

@@ -94,9 +94,6 @@
 /x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
 /x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime
 
-# Beats
-/x-pack/plugins/beats_management/  @elastic/beats
-#CC# /x-pack/plugins/beats_management/ @elastic/beats
 
 # Presentation
 /src/plugins/dashboard/ @elastic/kibana-presentation

.github/ISSUE_TEMPLATE/v8_breaking_change.md

@@ -13,7 +13,8 @@ assignees: ''
 ****************************************
  
 Please add a team label to denote the team that the
-breaking change is applicable to.
+breaking change is applicable to. If the work requires
+changes to Upgrade Assistant itself, please tag Team:Elasticsearch UI.
  
 -->
 
@@ -23,14 +24,20 @@ breaking change is applicable to.
 
 8.0
 
+**Is this a Kibana or Elasticsearch breaking change?**
+
+<!-- Kibana breaking changes can be registered via the Kibana deprecations service. Elasticsearch breaking changes may require custom logic in Upgrade Assistant and assistance from the Elasticsearch UI team. See more details below. -->
+
 **Describe the change. How will it manifest to users?**
 
 **How many users will be affected?**
 
 <!-- e.g. Based on telemetry data, roughly 75% of our users will need to make changes to x. -->
 <!-- e.g. A majority of users will need to make changes to x. -->
 
-**Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
+**Are there any edge cases?**
+
+**[For Kibana deprecations] Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
 
 <!-- The deprecation service is consumed by the Upgrade Assistant to surface Kibana deprecations.
   It provides a way for Kibana deprecations to be resolved automatically via an API
@@ -39,8 +46,11 @@ breaking change is applicable to.
 <!-- Each plugin owner is responsible for registering their deprecations via the service.
   Please link to the issue/PR that will add this functionality. -->
 
-**Are there any edge cases?**
+**[For Elasticsearch deprecations] Can the Upgrade Assistant make the migration easier for users? Please explain the proposed solution in as much detail as possible.**
+
+<!-- Upgrade Assistant consumes the ES deprecation info API to surface deprecations to users. In some cases, Upgrade Assistant can provide a way to resolve a particular deprecation returned from the API. Examples include: reindexing an old index, removing deprecated index settings, upgrading or deleting an old Machine Learning model snapshot. -->
 
+<!-- Please provide a detailed explanation on how you foresee the proposed "fix" to work, e.g., "The deprecation will be surfaced via XXX message in the deprecation info API. Upgrade Assistant can call XXX API to resolve this deprecation". See https://github.com/elastic/kibana/issues/91879 as a real-world example. -->
 ## Test Data
 
 <!-- Provide test data. We can’t build a solution without data to test it against. -->

.i18nrc.json

@@ -1,6 +1,5 @@
 {
   "paths": {
-    "common.ui": "src/legacy/ui",
     "console": "src/plugins/console",
     "core": "src/core",
     "discover": "src/plugins/discover",
@@ -61,6 +60,5 @@
     "apmOss": "src/plugins/apm_oss",
     "usageCollection": "src/plugins/usage_collection"
   },
-  "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": []
 }

api_docs/alerting.json

@@ -516,13 +516,15 @@
             "label": "rule",
             "description": [],
             "signature": [
+              "Pick<Pick<",
               {
                 "pluginId": "alerting",
                 "scope": "common",
                 "docId": "kibAlertingPluginApi",
-                "section": "def-common.SanitizedRuleConfig",
-                "text": "SanitizedRuleConfig"
-              }
+                "section": "def-common.Alert",
+                "text": "Alert"
+              },
+              "<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
             ],
             "source": {
               "path": "x-pack/plugins/alerting/server/types.ts",
@@ -840,7 +842,7 @@
                 "description": [],
                 "source": {
                   "path": "x-pack/plugins/alerting/server/types.ts",
-                  "lineNumber": 75
+                  "lineNumber": 76
                 },
                 "deprecated": false
               }
@@ -1030,7 +1032,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/alerting/server/types.ts",
-                  "lineNumber": 107
+                  "lineNumber": 109
                 },
                 "deprecated": false
               }
@@ -3913,7 +3915,15 @@
         "label": "SanitizedRuleConfig",
         "description": [],
         "signature": [
-          "Pick<Pick<Alert<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"muteAll\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
+          "Pick<Pick<",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.Alert",
+            "text": "Alert"
+          },
+          "<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/alerting/common/alert.ts",