Merge branch 'main' into ml-index-exists-api-tests

.buildkite/ftr_configs.yml

@@ -7,6 +7,7 @@ disabled:
   - x-pack/test/functional/config.base.js
   - x-pack/test/detection_engine_api_integration/security_and_spaces/config.base.ts
   - x-pack/test/functional_enterprise_search/base_config.ts
+  - x-pack/test/localization/config.base.ts
   - test/server_integration/config.base.js
 
   # QA suites that are run out-of-band
@@ -116,9 +117,13 @@ enabled:
   - test/server_integration/http/ssl/config.js
   - test/ui_capabilities/newsfeed_err/config.ts
   - x-pack/test/accessibility/config.ts
+  - x-pack/test/localization/config.ja_jp.ts
+  - x-pack/test/localization/config.fr_fr.ts
+  - x-pack/test/localization/config.zh_cn.ts
   - x-pack/test/alerting_api_integration/basic/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
+  - x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
   - x-pack/test/alerting_api_integration/spaces_only/config.ts
   - x-pack/test/api_integration_basic/config.ts
@@ -133,6 +138,7 @@ enabled:
   - x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts
   - x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
   - x-pack/test/cases_api_integration/spaces_only/config.ts
+  - x-pack/test/cloud_security_posture_functional/config.ts
   - x-pack/test/detection_engine_api_integration/basic/config.ts
   - x-pack/test/detection_engine_api_integration/security_and_spaces/group1/config.ts
   - x-pack/test/detection_engine_api_integration/security_and_spaces/group2/config.ts
@@ -155,7 +161,6 @@ enabled:
   - x-pack/test/functional_embedded/config.ts
   - x-pack/test/functional_enterprise_search/without_host_configured.config.ts
   - x-pack/test/functional_execution_context/config.ts
-  - x-pack/test/functional_synthetics/config.js
   - x-pack/test/functional_with_es_ssl/config.ts
   - x-pack/test/functional/apps/advanced_settings/config.ts
   - x-pack/test/functional/apps/aiops/config.ts

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -389,7 +389,7 @@ export async function pickTestGroupRunOrder() {
             label: 'Jest Tests',
             command: getRequiredEnv('JEST_UNIT_SCRIPT'),
             parallelism: unit.count,
-            timeout_in_minutes: 90,
+            timeout_in_minutes: 60,
             key: 'jest',
             agents: {
               queue: 'n2-4-spot',
@@ -409,7 +409,7 @@ export async function pickTestGroupRunOrder() {
             label: 'Jest Integration Tests',
             command: getRequiredEnv('JEST_INTEGRATION_SCRIPT'),
             parallelism: integration.count,
-            timeout_in_minutes: 120,
+            timeout_in_minutes: 60,
             key: 'jest-integration',
             agents: {
               queue: 'n2-4-spot',
@@ -446,7 +446,7 @@ export async function pickTestGroupRunOrder() {
                 ({ title, key, queue = defaultQueue }): BuildkiteStep => ({
                   label: title,
                   command: getRequiredEnv('FTR_CONFIGS_SCRIPT'),
-                  timeout_in_minutes: 150,
+                  timeout_in_minutes: 60,
                   agents: {
                     queue,
                   },

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -56,12 +56,14 @@ const uploadPipeline = (pipelineContent: string | object) => {
 
     if (
       (await doAnyChangesMatch([
+        /^packages\/kbn-securitysolution-.*/,
         /^x-pack\/plugins\/lists/,
         /^x-pack\/plugins\/security_solution/,
         /^x-pack\/plugins\/timelines/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
         /^x-pack\/test\/security_solution_cypress/,
+        /^fleet_packages\.json/, // It contains reference to prebuilt detection rules, we want to run security solution tests if it changes
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {

.buildkite/scripts/steps/cloud/purge_deployments.ts

@@ -25,16 +25,26 @@ for (const deployment of prDeployments) {
     const prNumber = deployment.name.match(/^kibana-pr-([0-9]+)$/)[1];
     const prJson = execSync(`gh pr view '${prNumber}' --json state,labels,commits`).toString();
     const pullRequest = JSON.parse(prJson);
+    const prOpen = pullRequest.state === 'OPEN';
 
     const lastCommit = pullRequest.commits.slice(-1)[0];
     const lastCommitTimestamp = new Date(lastCommit.committedDate).getTime() / 1000;
 
-    if (pullRequest.state !== 'OPEN') {
+    const persistDeployment = Boolean(
+      pullRequest.labels.filter((label: any) => label.name === 'ci:cloud-persist-deployment').length
+    );
+    if (prOpen && persistDeployment) {
+      continue;
+    }
+
+    if (!prOpen) {
       console.log(`Pull Request #${prNumber} is no longer open, will delete associated deployment`);
       deploymentsToPurge.push(deployment);
     } else if (
-      !pullRequest.labels.filter((label: any) =>
-        /^ci:(deploy-cloud|cloud-deploy|cloud-redeploy)$/.test(label.name)
+      !Boolean(
+        pullRequest.labels.filter((label: any) =>
+          /^ci:(cloud-deploy|cloud-redeploy)$/.test(label.name)
+        ).length
       )
     ) {
       console.log(

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

@@ -7,117 +7,13 @@ source .buildkite/scripts/common/util.sh
 is_test_execution_step
 
 .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
 
-function is_running {
-  kill -0 "$1" &>/dev/null
-}
-
-# unset env vars defined in other parts of CI for automatic APM collection of
-# Kibana. We manage APM config in our FTR config and performance service, and
-# APM treats config in the ENV with a very high precedence.
-unset ELASTIC_APM_ENVIRONMENT
-unset ELASTIC_APM_TRANSACTION_SAMPLE_RATE
-unset ELASTIC_APM_SERVER_URL
-unset ELASTIC_APM_SECRET_TOKEN
-unset ELASTIC_APM_ACTIVE
-unset ELASTIC_APM_CONTEXT_PROPAGATION_ONLY
-unset ELASTIC_APM_ACTIVE
-unset ELASTIC_APM_SERVER_URL
-unset ELASTIC_APM_SECRET_TOKEN
-unset ELASTIC_APM_GLOBAL_LABELS
-
-# `kill $esPid` doesn't work, seems that kbn-es doesn't listen to signals correctly, this does work
-trap 'killall node -q' EXIT
-
-export TEST_ES_URL=http://elastic:changeme@localhost:9200
-export TEST_ES_DISABLE_STARTUP=true
-
-echo "--- determining which journeys to run"
-
-journeys=$(buildkite-agent meta-data get "failed-journeys" --default '')
-if [ "$journeys" != "" ]; then
-  echo "re-running failed journeys:${journeys}"
-else
-  paths=()
-  for path in x-pack/performance/journeys/*; do
-    paths+=("$path")
-  done
-  journeys=$(printf "%s\n" "${paths[@]}")
-  echo "running discovered journeys:${journeys}"
-fi
-
-# track failed journeys here which might get written to metadata
-failedJourneys=()
-
-while read -r journey; do
-  if [ "$journey" == "" ]; then
-    continue;
-  fi
-
-  echo "--- $journey - 🔎 Start es"
-
-  node scripts/es snapshot&
-  export esPid=$!
-
-  # Pings the es server every second for up to 2 minutes until it is green
-  curl \
-    --fail \
-    --silent \
-    --retry 120 \
-    --retry-delay 1 \
-    --retry-connrefused \
-    -XGET "${TEST_ES_URL}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow" \
-    > /dev/null
-
-  echo "✅ ES is ready and will run in the background"
-
-  phases=("WARMUP" "TEST")
-  status=0
-  for phase in "${phases[@]}"; do
-    echo "--- $journey - $phase"
-
-    export TEST_PERFORMANCE_PHASE="$phase"
-
-    set +e
-    node scripts/functional_tests \
-      --config "$journey" \
-      --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
-      --debug \
-      --bail
-    status=$?
-    set -e
-
-    if [ $status -ne 0 ]; then
-      failedJourneys+=("$journey")
-      echo "^^^ +++"
-      echo "❌ FTR failed with status code: $status"
-      break
-    fi
-  done
-
-  # remove trap, we're manually shutting down
-  trap - EXIT;
-
-  echo "--- $journey - 🔎 Shutdown ES"
-  killall node
-  echo "waiting for $esPid to exit gracefully";
-
-  timeout=30 #seconds
-  dur=0
-  while is_running $esPid; do
-    sleep 1;
-    ((dur=dur+1))
-    if [ $dur -ge $timeout ]; then
-      echo "es still running after $dur seconds, killing ES and node forcefully";
-      killall -SIGKILL java
-      killall -SIGKILL node
-      sleep 5;
-    fi
-  done
-done <<< "$journeys"
+echo "--- Running performance tests"
+node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION"
 
 echo "--- Upload journey step screenshots"
 JOURNEY_SCREENSHOTS_DIR="${KIBANA_DIR}/data/journey_screenshots"
@@ -126,11 +22,3 @@ if [ -d "$JOURNEY_SCREENSHOTS_DIR" ]; then
   buildkite-agent artifact upload "**/*fullscreen*.png"
   cd "$KIBANA_DIR"
 fi
-
-echo "--- report/record failed journeys"
-if [ "${failedJourneys[*]}" != "" ]; then
-  buildkite-agent meta-data set "failed-journeys" "$(printf "%s\n" "${failedJourneys[@]}")"
-
-  echo "failed journeys: ${failedJourneys[*]}"
-  exit 1
-fi

.buildkite/scripts/steps/scalability/benchmarking.sh

@@ -74,53 +74,9 @@ download_artifacts
 echo "--- Clone kibana-load-testing repo and compile project"
 checkout_and_compile_load_runner
 
-echo "--- Run Scalability Tests with Elasticsearch started only once and Kibana restart before each journey"
+echo "--- Run Scalability Tests"
 cd "$KIBANA_DIR"
-node scripts/es snapshot&
-
-esPid=$!
-# Set trap on EXIT to stop Elasticsearch process
-trap "kill -9 $esPid" EXIT
-
-# unset env vars defined in other parts of CI for automatic APM collection of
-# Kibana. We manage APM config in our FTR config and performance service, and
-# APM treats config in the ENV with a very high precedence.
-unset ELASTIC_APM_ENVIRONMENT
-unset ELASTIC_APM_TRANSACTION_SAMPLE_RATE
-unset ELASTIC_APM_SERVER_URL
-unset ELASTIC_APM_SECRET_TOKEN
-unset ELASTIC_APM_ACTIVE
-unset ELASTIC_APM_CONTEXT_PROPAGATION_ONLY
-unset ELASTIC_APM_GLOBAL_LABELS
-unset ELASTIC_APM_MAX_QUEUE_SIZE
-unset ELASTIC_APM_METRICS_INTERVAL
-unset ELASTIC_APM_CAPTURE_SPAN_STACK_TRACES
-unset ELASTIC_APM_BREAKDOWN_METRICS
-
-
-export TEST_ES_DISABLE_STARTUP=true
-ES_HOST="localhost:9200"
-export TEST_ES_URL="http://elastic:changeme@${ES_HOST}"
-# Overriding Gatling default configuration
-export ES_URL="http://${ES_HOST}"
-
-# Pings the ES server every second for 2 mins until its status is green
-curl --retry 120 \
-  --retry-delay 1 \
-  --retry-connrefused \
-  -I -XGET "${TEST_ES_URL}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow"
-
-export ELASTIC_APM_ACTIVE=true
-
-for journey in scalability_traces/server/*; do
-    export SCALABILITY_JOURNEY_PATH="$KIBANA_DIR/$journey"
-    echo "--- Run scalability file: $SCALABILITY_JOURNEY_PATH"
-    node scripts/functional_tests \
-      --config x-pack/test/scalability/config.ts \
-      --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
-      --logToFile \
-      --debug
-done
+node scripts/run_scalability --kibana-install-dir "$KIBANA_BUILD_LOCATION" --journey-config-path "scalability_traces/server"
 
 echo "--- Upload test results"
 upload_test_results

.buildkite/scripts/steps/storybooks/build_and_upload.ts

@@ -31,7 +31,6 @@ const STORYBOOKS = [
   'expression_reveal_image',
   'expression_shape',
   'expression_tagcloud',
-  'files',
   'fleet',
   'home',
   'infra',

.buildkite/scripts/steps/test/jest_parallel.sh

@@ -26,6 +26,13 @@ echo "--- downloading jest test run order"
 download_artifact jest_run_order.json .
 configs=$(jq -r 'getpath([env.TEST_TYPE]) | .groups[env.JOB | tonumber].names | .[]' jest_run_order.json)
 
+echo "+++ ⚠️ WARNING ⚠️"
+echo "
+  console.log(), console.warn(), and console.error() output in jest tests causes a massive amount
+  of noise on CI without any percevable benefit, so they have been disabled. If you want to log
+  output in your test temporarily, you can modify 'packages/kbn-test/src/jest/setup/disable_console_logs.js'
+"
+
 while read -r config; do
   echo "--- $ node scripts/jest --config $config"
 

.eslintignore

@@ -39,7 +39,7 @@ snapshots.js
 /packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
 /packages/kbn-ui-framework/dist
 /packages/kbn-flot-charts/lib
-/packages/kbn-monaco/src/painless/antlr
+/packages/kbn-monaco/src/**/antlr
 
 # Bazel
 /bazel-*