Merge branch 'master' into 106513-alert-reason-formatting

.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"

.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}}

.gitignore

@@ -19,6 +19,9 @@ target
 *.iml
 *.log
 
+# Ignore example plugin builds
+/examples/*/build
+
 # Ignore certain functional test runner artifacts
 /test/*/failure_debug
 /test/*/screenshots/diff
@@ -76,6 +79,6 @@ report.asciidoc
 .yarn-local-mirror
 
 # Bazel
-bazel
-bazel-*
+/bazel
+/bazel-*
 .bazelrc.user

.i18nrc.json

@@ -19,6 +19,7 @@
     "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",

api_docs/alerting.json

@@ -701,7 +701,7 @@
             "description": [],
             "signature": [
               "() => Set<",
-              "RegistryAlertType",
+              "RegistryRuleType",
               ">"
             ],
             "source": {
@@ -1330,7 +1330,7 @@
             "description": [],
             "signature": [
               "() => Set<",
-              "RegistryAlertType",
+              "RegistryRuleType",
               ">"
             ],
             "source": {

api_docs/triggers_actions_ui.json

@@ -2187,10 +2187,10 @@
           },
           {
             "parentPluginId": "triggersActionsUi",
-            "id": "def-public.TriggersAndActionsUiServices.alertTypeRegistry",
+            "id": "def-public.TriggersAndActionsUiServices.ruleTypeRegistry",
             "type": "Object",
             "tags": [],
-            "label": "alertTypeRegistry",
+            "label": "ruleTypeRegistry",
             "description": [],
             "signature": [
               "{ get: (id: string) => ",
@@ -2535,10 +2535,10 @@
       },
       {
         "parentPluginId": "triggersActionsUi",
-        "id": "def-public.AlertTypeRegistryContract",
+        "id": "def-public.RuleTypeRegistryContract",
         "type": "Type",
         "tags": [],
-        "label": "AlertTypeRegistryContract",
+        "label": "RuleTypeRegistryContract",
         "description": [],
         "signature": [
           "{ get: (id: string) => ",
@@ -3623,10 +3623,10 @@
         },
         {
           "parentPluginId": "triggersActionsUi",
-          "id": "def-public.TriggersAndActionsUIPublicPluginSetup.alertTypeRegistry",
+          "id": "def-public.TriggersAndActionsUIPublicPluginSetup.ruleTypeRegistry",
           "type": "Object",
           "tags": [],
-          "label": "alertTypeRegistry",
+          "label": "ruleTypeRegistry",
           "description": [],
           "signature": [
             "TypeRegistry",
@@ -3684,10 +3684,10 @@
         },
         {
           "parentPluginId": "triggersActionsUi",
-          "id": "def-public.TriggersAndActionsUIPublicPluginStart.alertTypeRegistry",
+          "id": "def-public.TriggersAndActionsUIPublicPluginStart.ruleTypeRegistry",
           "type": "Object",
           "tags": [],
-          "label": "alertTypeRegistry",
+          "label": "ruleTypeRegistry",
           "description": [],
           "signature": [
             "TypeRegistry",