Merge branch 'main' into discover-state-refactor-app-state

.backportrc.json

@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.7",
     "8.6",
     "8.5",
     "8.4",
@@ -43,7 +44,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.7.0$": "main",
+    "^v8.8.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

.buildkite/ftr_configs.yml

@@ -4,11 +4,13 @@ disabled:
 
   # Base config files, only necessary to inform config finding script
   - test/functional/config.base.js
+  - test/functional/firefox/config.base.ts
   - 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
+  - x-pack/test/functional_with_es_ssl/config.base.ts
 
   # QA suites that are run out-of-band
   - x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
@@ -98,7 +100,11 @@ enabled:
   - test/functional/apps/visualize/group6/config.ts
   - test/functional/apps/visualize/replaced_vislib_chart_types/config.ts
   - test/functional/config.ccs.ts
-  - test/functional/config.firefox.js
+  - test/functional/firefox/console.config.ts
+  - test/functional/firefox/dashboard.config.ts
+  - test/functional/firefox/discover.config.ts
+  - test/functional/firefox/home.config.ts
+  - test/functional/firefox/visualize.config.ts
   - test/health_gateway/config.ts
   - test/interactive_setup_api_integration/enrollment_flow.config.ts
   - test/interactive_setup_api_integration/manual_configuration_flow_without_tls.config.ts
@@ -180,7 +186,10 @@ 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_with_es_ssl/config.ts
+  - x-pack/test/functional_with_es_ssl/apps/cases/group1/config.ts
+  - x-pack/test/functional_with_es_ssl/apps/cases/group2/config.ts
+  - x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/config.ts
+  - x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/config.ts
   - x-pack/test/functional/apps/advanced_settings/config.ts
   - x-pack/test/functional/apps/aiops/config.ts
   - x-pack/test/functional/apps/api_keys/config.ts

.buildkite/pipelines/pull_request/check_next_docs.yml

@@ -0,0 +1,10 @@
+steps:
+  - command: .buildkite/scripts/steps/next_docs/build_and_validate_docs.sh
+    label: 'Build and Validate Next Docs'
+    agents:
+      queue: n2-4-spot
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3

.buildkite/scripts/build_kibana.sh

@@ -8,14 +8,15 @@ export KBN_NP_PLUGINS_BUILT=true
 
 echo "--- Build Kibana Distribution"
 
-BUILD_ARGS=""
-is_pr_with_label "ci:build-all-platforms" && BUILD_ARGS="--all-platforms"
-is_pr_with_label "ci:build-example-plugins" && BUILD_ARGS="$BUILD_ARGS --example-plugins"
-is_pr_with_label "ci:build-docker-cross-compile" && BUILD_ARG="$BUILD_ARGS --docker-cross-compile"
-is_pr_with_label "ci:build-os-packages" || BUILD_ARGS="$BUILD_ARGS --skip-os-packages"
-is_pr_with_label "ci:build-canvas-shareable-runtime" || BUILD_ARGS="$BUILD_ARGS --skip-canvas-shareable-runtime"
-is_pr_with_label "ci:build-docker-contexts" || BUILD_ARGS="$BUILD_ARGS --skip-docker-contexts"
-node scripts/build $BUILD_ARGS
+BUILD_ARGS=("--with-test-plugins" "--with-example-plugins")
+is_pr_with_label "ci:build-all-platforms" && BUILD_ARGS+=("--all-platforms")
+is_pr_with_label "ci:build-docker-cross-compile" && BUILD_ARGS+=("--docker-cross-compile")
+is_pr_with_label "ci:build-os-packages" || BUILD_ARGS+=("--skip-os-packages")
+is_pr_with_label "ci:build-canvas-shareable-runtime" || BUILD_ARGS+=("--skip-canvas-shareable-runtime")
+is_pr_with_label "ci:build-docker-contexts" || BUILD_ARGS+=("--skip-docker-contexts")
+
+echo "> node scripts/build" "${BUILD_ARGS[@]}"
+node scripts/build "${BUILD_ARGS[@]}"
 
 if is_pr_with_label "ci:build-cloud-image"; then
   echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co

.buildkite/scripts/common/env.sh

@@ -12,6 +12,8 @@ PARENT_DIR="$(cd "$KIBANA_DIR/.."; pwd)"
 export PARENT_DIR
 export WORKSPACE="${WORKSPACE:-$PARENT_DIR}"
 
+export DOCS_REPO_CACHE_DIR="$HOME/.docs-repos"
+
 # A few things, such as Chrome, respect this variable
 # For many agent types, the workspace is mounted on a local ssd, so will be faster than the default tmp dir location
 if [[ -d /opt/local-ssd/buildkite ]]; then

.buildkite/scripts/packer_cache.sh

@@ -13,3 +13,6 @@ yarn kbn bootstrap
 for version in $(cat versions.json | jq -r '.versions[].version'); do
   node scripts/es snapshot --download-only --base-path "$ES_CACHE_DIR" --version "$version"
 done
+
+echo "--- Cloning repos for docs build"
+node scripts/validate_next_docs --clone-only

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

@@ -171,6 +171,19 @@ const uploadPipeline = (pipelineContent: string | object) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml'));
     }
 
+    if (
+      (await doAnyChangesMatch([
+        /\.docnav\.json$/,
+        /\.apidocs\.json$/,
+        /\.devdocs\.json$/,
+        /\.mdx$/,
+        /^dev_docs\/.*(png|gif|jpg|jpeg|webp)$/,
+      ])) ||
+      GITHUB_PR_LABELS.includes('ci:build-next-docs')
+    ) {
+      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/check_next_docs.yml'));
+    }
+
     pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml'));
 
     uploadPipeline(pipeline.join('\n'));

.buildkite/scripts/steps/artifacts/build.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 source .buildkite/scripts/steps/artifacts/env.sh
 
 echo "--- Build Kibana artifacts"
-node scripts/build --all-platforms --debug --docker-cross-compile $(echo "$BUILD_ARGS")
+node scripts/build --all-platforms --debug --docker-cross-compile "${BUILD_ARGS[@]}"
 
 echo "--- Extract default i18n messages"
 mkdir -p target/i18n

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

@@ -11,7 +11,7 @@ KIBANA_DOCKER_CONTEXT="${KIBANA_DOCKER_CONTEXT:="default"}"
 
 echo "--- Create contexts"
 mkdir -p target
-node scripts/build --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact $(echo "$BUILD_ARGS")
+node scripts/build --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact "${BUILD_ARGS[@]}"
 
 echo "--- Setup context"
 DOCKER_BUILD_FOLDER=$(mktemp -d)

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -90,6 +90,8 @@ steps:
         TARGET_FILE: kibana-controller.yaml
         IMAGE_TAG: "$GIT_ABBREV_COMMIT"
         SERVICE: kibana-controller
+        NAMESPACE: kibana-ci
+        IMAGE_NAME: kibana
 EOF
 
 else

.buildkite/scripts/steps/artifacts/env.sh

@@ -15,11 +15,11 @@ fi
 
 if [[ "$RELEASE_BUILD" == "true" ]]; then
   FULL_VERSION="$QUALIFIER_VERSION"
-  BUILD_ARGS="--release --version-qualifier=$VERSION_QUALIFIER"
+  BUILD_ARGS=("--release" "--version-qualifier=$VERSION_QUALIFIER")
   WORKFLOW="staging"
 else
   FULL_VERSION="$QUALIFIER_VERSION-SNAPSHOT"
-  BUILD_ARGS="--version-qualifier=$VERSION_QUALIFIER"
+  BUILD_ARGS=("--version-qualifier=$VERSION_QUALIFIER")
   WORKFLOW="snapshot"
 fi
 

.buildkite/scripts/steps/checks.sh

@@ -6,6 +6,7 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
 .buildkite/scripts/bootstrap.sh
 
 .buildkite/scripts/steps/checks/precommit_hook.sh
+.buildkite/scripts/steps/checks/packages.sh
 .buildkite/scripts/steps/checks/ts_projects.sh
 .buildkite/scripts/steps/checks/packages.sh
 .buildkite/scripts/steps/checks/bazel_packages.sh
@@ -18,7 +19,6 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
 .buildkite/scripts/steps/checks/i18n.sh
 .buildkite/scripts/steps/checks/file_casing.sh
 .buildkite/scripts/steps/checks/licenses.sh
-.buildkite/scripts/steps/checks/plugins_with_circular_deps.sh
 .buildkite/scripts/steps/checks/test_projects.sh
 .buildkite/scripts/steps/checks/test_hardening.sh
 .buildkite/scripts/steps/checks/ftr_configs.sh

.buildkite/scripts/steps/checks/packages.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
-echo --- Lint packages
+echo --- Lint Packages
 cmd="node scripts/lint_packages"
 if is_pr && ! is_auto_commit_disabled; then
   cmd="$cmd --fix"

.buildkite/scripts/steps/checks/ts_projects.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
-echo --- Lint TS projects
+echo --- Lint TS Projects
 cmd="node scripts/lint_ts_projects"
 if is_pr && ! is_auto_commit_disabled; then
   cmd="$cmd --fix"

.buildkite/scripts/steps/next_docs/build_and_validate_docs.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/bootstrap.sh
+
+echo "--- Build docs"
+
+echo "⚠️ run 'node scripts/validate_next_docs --debug' locally to debug ⚠️"
+node scripts/validate_next_docs
+
+
+

.eslintrc.js

@@ -121,7 +121,7 @@ const VENN_DIAGRAM_HEADER = `
 
 /** Packages which should not be included within production code. */
 const DEV_PACKAGE_DIRS = getPackages(REPO_ROOT).flatMap((pkg) =>
-  pkg.isDevOnly ? pkg.normalizedRepoRelativeDir : []
+  pkg.isDevOnly() ? pkg.normalizedRepoRelativeDir : []
 );
 
 /** Directories (at any depth) which include dev-only code. */
@@ -902,7 +902,10 @@ module.exports = {
       files: ['x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
-        'react-hooks/exhaustive-deps': ['error', { additionalHooks: '^(useAsync)$' }],
+        'react-hooks/exhaustive-deps': [
+          'error',
+          { additionalHooks: '^(useAsync|useTimeRangeAsync|useAutoAbortedHttpClient)$' },
+        ],
       },
     },
     {
@@ -1731,7 +1734,11 @@ module.exports = {
      * Code inside .buildkite runs separately from everything else in CI, before bootstrap, with ts-node. It needs a few tweaks because of this.
      */
     {
-      files: 'packages/kbn-{package-*,repo-*,dep-*}/**/*',
+      files: [
+        'packages/kbn-{package-*,repo-*,dep-*}/**/*',
+        'packages/kbn-validate-next-docs-cli/**/*',
+        'packages/kbn-find-used-node-modules/**/*',
+      ],
       rules: {
         'max-classes-per-file': 'off',
       },