Merge branch 'main' into oa.cases.add.comment

.bazelversion

@@ -1 +1 @@
-5.1.1
+5.2.0

.buildkite/pipelines/artifacts.yml

@@ -51,18 +51,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: KIBANA_DOCKER_CONTEXT=cloud .buildkite/scripts/steps/artifacts/docker_context.sh
-    label: 'Docker Context Verification'
-    soft_fail: true
-    agents:
-      queue: n2-2
-    timeout_in_minutes: 30
-    if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
-
   - command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
     agents:

.buildkite/pipelines/performance/daily.yml

@@ -19,11 +19,11 @@ steps:
     depends_on: build
     key: tests
 
-  - label: ':shipit: Performance Tests dataset extraction for scalability benchmarking'
-    command: .buildkite/scripts/steps/functional/scalability_dataset_extraction.sh
-    agents:
-      queue: n2-2
-    depends_on: tests
+  # - label: ':shipit: Performance Tests dataset extraction for scalability benchmarking'
+  #   command: .buildkite/scripts/steps/functional/scalability_dataset_extraction.sh
+  #   agents:
+  #     queue: n2-2
+  #   depends_on: tests
 
   - wait: ~
     continue_on_failure: true

.buildkite/scripts/steps/artifacts/docker_context.sh

@@ -27,10 +27,6 @@ tar -xf "target/$DOCKER_CONTEXT_FILE" -C "$DOCKER_BUILD_FOLDER"
 cd $DOCKER_BUILD_FOLDER
 
 buildkite-agent artifact download "kibana-$FULL_VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
-if [[ "$KIBANA_DOCKER_CONTEXT" == "cloud" ]]; then
-  buildkite-agent artifact download "metricbeat-$FULL_VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
-  buildkite-agent artifact download "filebeat-$FULL_VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
-fi
 
 echo "--- Build context"
 docker build .

.buildkite/scripts/steps/functional/performance_playwright.sh

@@ -5,6 +5,8 @@ set -euo pipefail
 source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
+# These tests are running on static workers so we have to make sure we delete previous build of Kibana
+rm -rf "$KIBANA_BUILD_LOCATION"
 .buildkite/scripts/download_build_artifacts.sh
 
 echo --- Run Performance Tests with Playwright config

.github/paths-labeller.yml

@@ -14,10 +14,9 @@
     - "x-pack/plugins/fleet/**/*.*"
     - "x-pack/test/fleet_api_integration/**/*.*"
   - "Team:uptime":
-    - "x-pack/plugins/uptime/**/*.*"
-    - "x-pack/plugins/apm/public/application/csmApp.tsx"
-    - "x-pack/plugins/apm/public/components/app/RumDashboard/**/*.*"
-    - "x-pack/plugins/apm/public/components/app/RumDashboard/*.*"
+    - "x-pack/plugins/synthetics/**/*.*"
+    - "x-pack/plugins/ux/**/*.*"
+    - "x-pack/plugins/observability/public/components/shared/exploratory_view/**/*.*"
     - "x-pack/plugins/apm/server/lib/rum_client/**/*.*"
     - "x-pack/plugins/apm/server/lib/rum_client/*.*"
     - "x-pack/plugins/apm/server/routes/rum_client.ts"

.github/workflows/backport.yml

@@ -1,10 +1,7 @@
 on:
   pull_request_target:
-    branches:
-      - main
-    types:
-      - labeled
-      - closed
+    branches: ["main"]
+    types: ["labeled", "closed"]
 
 jobs:
   backport:
@@ -19,9 +16,14 @@ jobs:
       )
     steps:
       - name: Backport Action
-        uses: sqren/backport-github-action@v7.4.0
+        uses: sqren/backport-github-action@v8.5.2
         with:
           github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
 
-      - name: Backport log
-        run: cat ~/.backport/backport.log
+      - name: Info log
+        if: ${{ success() }}
+        run: cat /home/runner/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat /home/runner/.backport/backport.debug.log        

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

@@ -13,6 +13,12 @@ jobs:
     if: |
       github.event.pull_request.merged == true
       && !contains(github.event.pull_request.labels.*.name, 'auto-backport')
+      && !(
+        contains(github.event.pull_request.labels.*.name, 'backport:prev-minor')
+        || contains(github.event.pull_request.labels.*.name, 'backport:prev-major')
+        || contains(github.event.pull_request.labels.*.name, 'backport:all-open')
+        || contains(github.event.pull_request.labels.*.name, 'backport:auto-version')
+      )
       && !(
         (github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
         || (github.event.action == 'closed')

.github/workflows/on-merge.yml

@@ -0,0 +1,46 @@
+on:
+  pull_request_target:
+    branches:
+      - main
+    types:
+      - closed
+      - labeled
+
+jobs:
+  on-merge:
+    name: 'Label and Backport'
+    runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.merged == true
+      && (
+        contains(github.event.pull_request.labels.*.name, 'backport:prev-minor')
+        || contains(github.event.pull_request.labels.*.name, 'backport:prev-major')
+        || contains(github.event.pull_request.labels.*.name, 'backport:all-open')
+        || contains(github.event.pull_request.labels.*.name, 'backport:auto-version')
+      )
+      && (
+        (
+          github.event.action == 'labeled' && (
+            github.event.label.name == 'backport:prev-minor'
+            || github.event.label.name == 'backport:prev-major'
+            || github.event.label.name == 'backport:all-open'
+            || github.event.label.name == 'backport:auto-version'
+          )
+        )
+        || (github.event.action == 'closed')
+      )
+    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 On-Merge
+        uses: ./actions/on-merge
+        with:
+          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}

docs/api/actions-and-connectors.asciidoc

@@ -28,8 +28,8 @@ include::actions-and-connectors/delete.asciidoc[leveloffset=+1]
 include::actions-and-connectors/get.asciidoc[leveloffset=+1]
 include::actions-and-connectors/get_all.asciidoc[leveloffset=+1]
 include::actions-and-connectors/list.asciidoc[]
+include::actions-and-connectors/execute.asciidoc[leveloffset=+1]
 include::actions-and-connectors/update.asciidoc[leveloffset=+1]
-include::actions-and-connectors/execute.asciidoc[]
 include::actions-and-connectors/legacy/index.asciidoc[]
 include::actions-and-connectors/legacy/get.asciidoc[]
 include::actions-and-connectors/legacy/get_all.asciidoc[]

docs/api/actions-and-connectors/execute.asciidoc

@@ -1,19 +1,26 @@
 [[execute-connector-api]]
-=== Execute connector API
+== Run connector API
 ++++
-<titleabbrev>Execute connector</titleabbrev>
+<titleabbrev>Run connector</titleabbrev>
 ++++
 
-Executes a connector by ID.
+Runs a connector by ID.
 
 [[execute-connector-api-request]]
-==== {api-request-title}
+=== {api-request-title}
 
 `POST <kibana host>:<port>/api/actions/connector/<id>/_execute`
 
 `POST <kibana host>:<port>/s/<space_id>/api/actions/connector/<id>/_execute`
 
-[discrete]
+[[execute-connector-api-desc]]
+=== {api-description-title}
+
+You can use this API to test an <<alerting-concepts-actions,action>> that 
+involves interaction with Kibana services or integrations with third-party
+systems.
+
+[[execute-connector-api-prereq]]
 === {api-prereq-title}
 
 You must have `read` privileges for the *Actions and Connectors* feature in the
@@ -24,7 +31,7 @@ If you use an index connector, you must also have `all`, `create`, `index`, or
 `write` {ref}/security-privileges.html[indices privileges].
 
 [[execute-connector-api-params]]
-==== {api-path-parms-title}
+=== {api-path-parms-title}
 
 `id`::
   (Required, string) The ID of the connector.
@@ -33,20 +40,20 @@ If you use an index connector, you must also have `all`, `create`, `index`, or
   (Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
 
 [[execute-connector-api-request-body]]
-==== {api-request-body-title}
+=== {api-request-body-title}
 
 `params`::
   (Required, object) The parameters of the connector. Parameter properties vary depending on
   the connector type. For information about the parameter properties, refer to <<action-types,Action and connector types>>.
 
 [[execute-connector-api-codes]]
-==== {api-response-codes-title}
+=== {api-response-codes-title}
 
 `200`::
     Indicates a successful call.
 
 [[execute-connector-api-example]]
-==== {api-examples-title}
+=== {api-examples-title}
 
 Run an index connector:
 

docs/api/alerting.asciidoc

@@ -31,7 +31,7 @@ The following APIs are available for Alerting.
 
 For deprecated APIs, refer to <<alerts-api>>.
 
-include::alerting/create_rule.asciidoc[]
+include::alerting/create_rule.asciidoc[leveloffset=+1]
 include::alerting/update_rule.asciidoc[]
 include::alerting/get_rules.asciidoc[]
 include::alerting/delete_rule.asciidoc[]