addressed conflicts

.backportrc.json

@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.4",
     "8.3",
     "8.2",
     "8.1",
@@ -40,10 +41,11 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.4.0$": "main",
+    "^v8.5.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,
   "autoMergeMethod": "squash",
-  "backportBinary": "node scripts/backport"
+  "backportBinary": "node scripts/backport",
+  "prDescription": "{defaultPrDescription}\n\n<!--BACKPORT {commits} BACKPORT-->"
 }

.bazelignore

@@ -2,16 +2,26 @@
 # Issues are opened for to include that feature but not available yet
 # https://github.com/bazelbuild/bazel/issues/7093
 # https://github.com/bazelbuild/bazel/issues/8106
+.buildkite
 .ci
+.chromium
 .git
 .github
 .idea
+.native_modules
 .teamcity
 .yarn-local-mirror
+.vscode
+api_docs
 bazel-bin
 bazel-kibana
 bazel-out
 bazel-testlogs
 build
+data
+dev_docs
+docs
+legacy_rfcs
 node_modules
 target
+vars

.bazelversion

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

.buildkite/.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "extension": ["ts"],
+  "spec": "**/*.test.ts",
+  "require": "ts-node/register"
+}

.buildkite/.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

.buildkite/README.md

@@ -3,6 +3,7 @@
 ## Directory Structure
 
 - `hooks` - special directory used by Buildkite agents for [hooks](https://buildkite.com/docs/agent/v3/hooks)
+- `pipeline-utils` - Shared TypeScript utils for use in pipeline scripts
 - `pipelines` - contains pipeline definitions
 - `scripts/common` - scripts that get `source`d by other scripts to set environment variables or import shared functions
 - `scripts/lifecycle` - general scripts for tasks that run before or after individual steps or the entire build

.buildkite/ftr_configs.yml

@@ -32,6 +32,7 @@ disabled:
   - x-pack/test/security_solution_cypress/response_ops_cli_config.ts
   - x-pack/test/security_solution_cypress/upgrade_config.ts
   - x-pack/test/security_solution_cypress/visual_config.ts
+  - x-pack/test/threat_intelligence_cypress/visual_config.ts
   - x-pack/test/functional_enterprise_search/with_host_configured.config.ts
   - x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
   - x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
@@ -41,6 +42,7 @@ disabled:
   - x-pack/plugins/synthetics/e2e/config.ts
   - x-pack/plugins/synthetics/e2e/synthetics_run.ts
   - x-pack/plugins/ux/e2e/synthetics_run.ts
+  - x-pack/plugins/observability/e2e/synthetics_run.ts
 
   # Configs that exist but weren't running in CI when this file was introduced
   - test/visual_regression/config.ts
@@ -54,7 +56,9 @@ disabled:
   - x-pack/test/load/config.ts
   - x-pack/test/plugin_api_perf/config.js
   - x-pack/test/screenshot_creation/config.ts
+  - x-pack/test/fleet_packages/config.ts
 
+defaultQueue: 'n2-4-spot'
 enabled:
   - test/accessibility/config.ts
   - test/analytics/config.ts
@@ -70,9 +74,14 @@ enabled:
   - test/functional/apps/dashboard/group4/config.ts
   - test/functional/apps/dashboard/group5/config.ts
   - test/functional/apps/dashboard/group6/config.ts
-  - test/functional/apps/discover/config.ts
+  - test/functional/apps/discover/ccs_compatibility/config.ts
+  - test/functional/apps/discover/classic/config.ts
+  - test/functional/apps/discover/embeddable/config.ts
+  - test/functional/apps/discover/group1/config.ts
+  - test/functional/apps/discover/group2/config.ts
   - test/functional/apps/getting_started/config.ts
   - test/functional/apps/home/config.ts
+  - test/functional/apps/kibana_overview/config.ts
   - test/functional/apps/management/config.ts
   - test/functional/apps/saved_objects_management/config.ts
   - test/functional/apps/status_page/config.ts
@@ -93,7 +102,9 @@ enabled:
   - test/interactive_setup_functional/manual_configuration_without_tls.config.ts
   - test/interactive_setup_functional/manual_configuration.config.ts
   - test/interpreter_functional/config.ts
-  - test/new_visualize_flow/config.ts
+  - test/node_roles_functional/all.config.ts
+  - test/node_roles_functional/background_tasks.config.ts
+  - test/node_roles_functional/ui.config.ts
   - test/plugin_functional/config.ts
   - test/server_integration/http/platform/config.status.ts
   - test/server_integration/http/platform/config.ts
@@ -204,6 +215,7 @@ enabled:
   - x-pack/test/reporting_functional/reporting_and_deprecated_security.config.ts
   - x-pack/test/reporting_functional/reporting_and_security.config.ts
   - x-pack/test/reporting_functional/reporting_without_security.config.ts
+  - x-pack/test/reporting_functional/reporting_and_timeout.config.ts
   - x-pack/test/rule_registry/security_and_spaces/config_basic.ts
   - x-pack/test/rule_registry/security_and_spaces/config_trial.ts
   - x-pack/test/rule_registry/spaces_only/config_basic.ts
@@ -232,9 +244,11 @@ enabled:
   - x-pack/test/security_api_integration/session_invalidate.config.ts
   - x-pack/test/security_api_integration/session_lifespan.config.ts
   - x-pack/test/security_api_integration/token.config.ts
+  - x-pack/test/security_api_integration/user_profiles.config.ts
   - x-pack/test/security_functional/login_selector.config.ts
   - x-pack/test/security_functional/oidc.config.ts
   - x-pack/test/security_functional/saml.config.ts
+  - x-pack/test/security_functional/insecure_cluster_warning.config.ts
   - x-pack/test/security_solution_endpoint_api_int/config.ts
   - x-pack/test/security_solution_endpoint/config.ts
   - x-pack/test/session_view/basic/config.ts