Merge branch 'master' into #79984

.buildkite/scripts/build_kibana.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 export KBN_NP_PLUGINS_BUILT=true
 
 echo "--- Build Kibana Distribution"
-node scripts/build --debug --no-oss
+node scripts/build --debug
 
 echo "--- Archive Kibana Distribution"
 linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"

.buildkite/scripts/common/env.sh

@@ -67,6 +67,6 @@ export TEST_KIBANA_HOST=localhost
 export TEST_KIBANA_PORT=6101
 export TEST_KIBANA_URL="http://elastic:changeme@localhost:6101"
 export TEST_ES_URL="http://elastic:changeme@localhost:6102"
-export TEST_ES_TRANSPORT_PORT=6103
+export TEST_ES_TRANSPORT_PORT=6301-6309
 export TEST_CORS_SERVER_PORT=6106
 export ALERTING_PROXY_PORT=6105

.buildkite/scripts/post_build_kibana.sh

@@ -6,7 +6,7 @@ if [[ ! "${DISABLE_CI_STATS_SHIPPING:-}" ]]; then
   echo "--- Ship Kibana Distribution Metrics to CI Stats"
   node scripts/ship_ci_stats \
     --metrics target/optimizer_bundle_metrics.json \
-    --metrics node_modules/@kbn/ui-shared-deps/shared_built_assets/metrics.json
+    --metrics build/kibana/node_modules/@kbn/ui-shared-deps/shared_built_assets/metrics.json
 fi
 
 echo "--- Upload Build Artifacts"

.eslintrc.js

@@ -446,6 +446,7 @@ module.exports = {
                   '!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
                   '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
                   '!(src|x-pack)/plugins/**/__stories__/index.{js,mjs,ts,tsx}',
+                  '!(src|x-pack)/plugins/**/__fixtures__/index.{js,mjs,ts,tsx}',
                 ],
                 allowSameFolder: true,
                 errorMessage: 'Plugins may only import from top-level public and server modules.',

.github/workflows/backport.yml

@@ -28,6 +28,11 @@ jobs:
       - name: Install Actions
         run: npm install --production --prefix ./actions
 
+      - name: Fix Version Label Gaps
+        uses: ./actions/fix-version-gaps
+        with:
+          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
+
       - name: Run Backport
         uses: ./actions/backport
         with:

.github/workflows/fix-version-gaps.yml

@@ -0,0 +1,35 @@
+on:
+  pull_request:
+    branches:
+      - master
+    types:
+      - closed
+
+jobs:
+  gaps:
+    name: Fix Version Label Gaps
+    # This fix also runs as part of the backport action (because backport depends on the labels)
+    # So we only need to trigger it for merged PRs that also won't be auto-backported
+    if: |
+      github.event.pull_request.merged == true
+      && !contains(github.event.pull_request.labels.*.name, 'auto-backport')
+      && !(
+        (github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
+        || (github.event.action == 'closed')
+      )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: 'elastic/kibana-github-actions'
+          ref: main
+          path: ./actions
+
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+
+      - name: Run Fix Gaps
+        uses: ./actions/fix-version-gaps
+        with:
+          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}

.i18nrc.json

@@ -1,5 +1,6 @@
 {
   "paths": {
+    "autocomplete": "packages/kbn-securitysolution-autocomplete/src",
     "console": "src/plugins/console",
     "core": "src/core",
     "discover": "src/plugins/discover",
@@ -17,7 +18,11 @@
     "devTools": "src/plugins/dev_tools",
     "expressions": "src/plugins/expressions",
     "expressionError": "src/plugins/expression_error",
+    "expressionImage": "src/plugins/expression_image",
+    "expressionMetric": "src/plugins/expression_metric",
+    "expressionRepeatImage": "src/plugins/expression_repeat_image",
     "expressionRevealImage": "src/plugins/expression_reveal_image",
+    "expressionShape": "src/plugins/expression_shape",
     "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -28,6 +33,7 @@
     "management": ["src/legacy/core_plugins/management", "src/plugins/management"],
     "maps_legacy": "src/plugins/maps_legacy",
     "monaco": "packages/kbn-monaco/src",
+    "esQuery": "packages/kbn-es-query/src",
     "presentationUtil": "src/plugins/presentation_util",
     "indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
     "indexPatternManagement": "src/plugins/index_pattern_management",

api_docs/alerting.json

@@ -669,19 +669,19 @@
         "children": [
           {
             "parentPluginId": "alerting",
-            "id": "def-server.AlertingApiRequestHandlerContext.getAlertsClient",
+            "id": "def-server.AlertingApiRequestHandlerContext.getRulesClient",
             "type": "Function",
             "tags": [],
-            "label": "getAlertsClient",
+            "label": "getRulesClient",
             "description": [],
             "signature": [
               "() => ",
               {
                 "pluginId": "alerting",
                 "scope": "server",
                 "docId": "kibAlertingPluginApi",
-                "section": "def-server.AlertsClient",
-                "text": "AlertsClient"
+                "section": "def-server.RulesClient",
+                "text": "RulesClient"
               }
             ],
             "source": {
@@ -1170,7 +1170,7 @@
           "<Params>"
         ],
         "source": {
-          "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+          "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
           "lineNumber": 140
         },
         "deprecated": false,
@@ -1183,7 +1183,7 @@
             "label": "page",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 141
             },
             "deprecated": false
@@ -1196,7 +1196,7 @@
             "label": "perPage",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 142
             },
             "deprecated": false
@@ -1209,7 +1209,7 @@
             "label": "total",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 143
             },
             "deprecated": false
@@ -1233,7 +1233,7 @@
               "<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
             ],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 144
             },
             "deprecated": false
@@ -1343,10 +1343,10 @@
           },
           {
             "parentPluginId": "alerting",
-            "id": "def-server.PluginStartContract.getAlertsClientWithRequest",
+            "id": "def-server.PluginStartContract.getRulesClientWithRequest",
             "type": "Function",
             "tags": [],
-            "label": "getAlertsClientWithRequest",
+            "label": "getRulesClientWithRequest",
             "description": [],
             "signature": [
               "(request: ",
@@ -1362,8 +1362,8 @@
                 "pluginId": "alerting",
                 "scope": "server",
                 "docId": "kibAlertingPluginApi",
-                "section": "def-server.AlertsClient",
-                "text": "AlertsClient"
+                "section": "def-server.RulesClient",
+                "text": "RulesClient"
               },
               ", \"get\" | \"delete\" | \"create\" | \"find\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\">"
             ],
@@ -1375,7 +1375,7 @@
             "children": [
               {
                 "parentPluginId": "alerting",
-                "id": "def-server.PluginStartContract.getAlertsClientWithRequest.$1",
+                "id": "def-server.PluginStartContract.getRulesClientWithRequest.$1",
                 "type": "Object",
                 "tags": [],
                 "label": "request",
@@ -1571,10 +1571,10 @@
       },
       {
         "parentPluginId": "alerting",
-        "id": "def-server.AlertsClient",
+        "id": "def-server.RulesClient",
         "type": "Type",
         "tags": [],
-        "label": "AlertsClient",
+        "label": "RulesClient",
         "description": [],
         "signature": [
           "{ get: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<Pick<",

api_docs/deprecations.mdx

@@ -26,8 +26,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L8) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L21) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L23) | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L23) | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L98) | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L23) | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L98) | - |
 
 
 

api_docs/security.json

@@ -1739,14 +1739,14 @@
           {
             "plugin": "alerting",
             "link": {
-              "path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
               "lineNumber": 23
             }
           },
           {
             "plugin": "alerting",
             "link": {
-              "path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
               "lineNumber": 98
             }
           }