Resolve merge conflict, pull latest code from main

.buildkite/ftr_configs.yml

@@ -146,6 +146,7 @@ enabled:
   - x-pack/test/functional/apps/cross_cluster_replication/config.ts
   - x-pack/test/functional/apps/dashboard/group1/config.ts
   - x-pack/test/functional/apps/dashboard/group2/config.ts
+  - x-pack/test/functional/apps/dashboard/group3/config.ts
   - x-pack/test/functional/apps/data_views/config.ts
   - x-pack/test/functional/apps/dev_tools/config.ts
   - x-pack/test/functional/apps/discover/config.ts
@@ -245,3 +246,9 @@ enabled:
   - x-pack/test/ui_capabilities/spaces_only/config.ts
   - x-pack/test/upgrade_assistant_integration/config.js
   - x-pack/test/usage_collection/config.ts
+  - x-pack/test/performance/journeys/ecommerce_dashboard/config.ts
+  - x-pack/test/performance/journeys/flight_dashboard/config.ts
+  - x-pack/test/performance/journeys/login/config.ts
+  - x-pack/test/performance/journeys/many_fields_discover/config.ts
+  - x-pack/test/performance/journeys/promotion_tracking_dashboard/config.ts
+  - x-pack/test/performance/journeys/web_logs_dashboard/config.ts

.buildkite/pipelines/code_coverage/daily.yml

@@ -13,7 +13,8 @@ steps:
       queue: kibana-default
     env:
       FTR_CONFIGS_DEPS: ''
-      LIMIT_CONFIG_TYPE: 'unit,functional,integration'
+#      LIMIT_CONFIG_TYPE: 'unit,functional,integration'
+      LIMIT_CONFIG_TYPE: 'unit,integration'
       JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest.sh'
       JEST_INTEGRATION_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest_integration.sh'
       FTR_CONFIGS_SCRIPT: '.buildkite/scripts/steps/code_coverage/ftr_configs.sh'
@@ -25,6 +26,6 @@ steps:
     depends_on:
       - jest
       - jest-integration
-      - ftr-configs
+#      - ftr-configs
     timeout_in_minutes: 30
     key: ingest

.buildkite/scripts/steps/code_coverage/ingest.sh

@@ -27,7 +27,7 @@ echo "--- Upload new git sha"
 
 echo "--- Download coverage artifacts"
 buildkite-agent artifact download target/kibana-coverage/jest/* .
-buildkite-agent artifact download target/kibana-coverage/functional/* .
+#buildkite-agent artifact download target/kibana-coverage/functional/* .
 buildkite-agent artifact download target/ran_files/* .
 ls -l target/ran_files/* || echo "### No ran-files found"
 
@@ -42,20 +42,20 @@ echo "--- Jest: Reset file paths prefix, merge coverage files, and generate the
 replacePaths "$KIBANA_DIR/target/kibana-coverage/jest" "CC_REPLACEMENT_ANCHOR" "$KIBANA_DIR"
 yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.jest.config.js
 
-echo "--- Functional: Reset file paths prefix, merge coverage files, and generate the final combined report"
+#echo "--- Functional: Reset file paths prefix, merge coverage files, and generate the final combined report"
 # Functional: Reset file paths prefix to Kibana Dir of final worker
-set +e
-sed -ie "s|CC_REPLACEMENT_ANCHOR|${KIBANA_DIR}|g" target/kibana-coverage/functional/*.json
-echo "--- Begin Split and Merge for Functional"
-splitCoverage target/kibana-coverage/functional
-splitMerge
-set -e
+#set +e
+#sed -ie "s|CC_REPLACEMENT_ANCHOR|${KIBANA_DIR}|g" target/kibana-coverage/functional/*.json
+#echo "--- Begin Split and Merge for Functional"
+#splitCoverage target/kibana-coverage/functional
+#splitMerge
+#set -e
 
 echo "--- Archive and upload combined reports"
 collectAndUpload target/kibana-coverage/jest/kibana-jest-coverage.tar.gz \
   target/kibana-coverage/jest-combined
-collectAndUpload target/kibana-coverage/functional/kibana-functional-coverage.tar.gz \
-  target/kibana-coverage/functional-combined
+#collectAndUpload target/kibana-coverage/functional/kibana-functional-coverage.tar.gz \
+#  target/kibana-coverage/functional-combined
 
 echo "--- Upload coverage static site"
 .buildkite/scripts/steps/code_coverage/reporting/uploadStaticSite.sh

.buildkite/scripts/steps/code_coverage/reporting/ingestData.sh

@@ -38,14 +38,20 @@ echo "### Generate Team Assignments"
 CI_STATS_DISABLED=true node scripts/generate_team_assignments.js \
   --verbose --src '.github/CODEOWNERS' --dest $TEAM_ASSIGN_PATH
 
-for x in functional jest; do
-  echo "### Ingesting coverage for ${x}"
-  COVERAGE_SUMMARY_FILE="target/kibana-coverage/${x}-combined/coverage-summary.json"
-
-  CI_STATS_DISABLED=true node scripts/ingest_coverage.js --path ${COVERAGE_SUMMARY_FILE} \
-    --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH &
-done
-wait
+#for x in functional jest; do
+#  echo "### Ingesting coverage for ${x}"
+#  COVERAGE_SUMMARY_FILE="target/kibana-coverage/${x}-combined/coverage-summary.json"
+#
+#  CI_STATS_DISABLED=true node scripts/ingest_coverage.js --path ${COVERAGE_SUMMARY_FILE} \
+#    --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH &
+#done
+#wait
+
+echo "### Ingesting coverage for JEST"
+COVERAGE_SUMMARY_FILE="target/kibana-coverage/jest-combined/coverage-summary.json"
+
+CI_STATS_DISABLED=true node scripts/ingest_coverage.js --path ${COVERAGE_SUMMARY_FILE} \
+  --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH
 
 echo "---  Ingesting Code Coverage - Complete"
 echo ""

.buildkite/scripts/steps/code_coverage/reporting/prokLinks.sh

@@ -4,7 +4,6 @@ set -euo pipefail
 
 cat << EOF > src/dev/code_coverage/www/index_partial_2.html
         <a class="nav-link" href="https://kibana-coverage.elastic.dev/${TIME_STAMP}/jest-combined/index.html">Latest Jest</a>
-        <a class="nav-link" href="https://kibana-coverage.elastic.dev/${TIME_STAMP}/functional-combined/index.html">Latest FTR</a>
       </nav>
     </div>
   </header>
@@ -26,4 +25,4 @@ cat << EOF > src/dev/code_coverage/www/index_partial_2.html
 EOF
 
 cat src/dev/code_coverage/www/index_partial.html > src/dev/code_coverage/www/index.html
-cat src/dev/code_coverage/www/index_partial_2.html >> src/dev/code_coverage/www/index.html
+cat src/dev/code_coverage/www/index_partial_2.html >> src/dev/code_coverage/www/index.html

.buildkite/scripts/steps/code_coverage/reporting/uploadStaticSite.sh

@@ -11,8 +11,10 @@ for x in 'src/dev/code_coverage/www/index.html' 'src/dev/code_coverage/www/404.h
    gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefix}
 done
 
-gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
+#gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
+#
+#for x in 'target/kibana-coverage/functional-combined' 'target/kibana-coverage/jest-combined'; do
+#    gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
+#done
 
-for x in 'target/kibana-coverage/functional-combined' 'target/kibana-coverage/jest-combined'; do
-    gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
-done
+gsutil -m -q cp -r -a public-read -z js,css,html 'target/kibana-coverage/jest-combined' ${uploadPrefixWithTimeStamp}

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

@@ -24,24 +24,20 @@ for i in "${journeys[@]}"; do
     echo "JOURNEY[${i}] is running"
 
     export TEST_PERFORMANCE_PHASE=WARMUP
-    export ELASTIC_APM_ACTIVE=false
     export JOURNEY_NAME="${i}"
 
     checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: WARMUP)" \
       node scripts/functional_tests \
-      --config x-pack/test/performance/config.playwright.ts \
-      --include "x-pack/test/performance/tests/playwright/${i}.ts" \
+      --config "x-pack/test/performance/journeys/${i}/config.ts" \
       --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
       --debug \
       --bail
 
     export TEST_PERFORMANCE_PHASE=TEST
-    export ELASTIC_APM_ACTIVE=true
 
     checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: TEST)" \
       node scripts/functional_tests \
-      --config x-pack/test/performance/config.playwright.ts \
-      --include "x-pack/test/performance/tests/playwright/${i}.ts" \
+      --config "x-pack/test/performance/journeys/${i}/config.ts" \
       --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
       --debug \
       --bail

.buildkite/scripts/steps/storybooks/build_and_upload.js

@@ -16,6 +16,7 @@ const STORYBOOKS = [
   'canvas',
   'ci_composite',
   'cloud',
+  'coloring',
   'controls',
   'custom_integrations',
   'dashboard_enhanced',

.eslintrc.js

@@ -657,6 +657,7 @@ module.exports = {
         'x-pack/test/*/*config.*ts',
         'x-pack/test/saved_object_api_integration/*/apis/**/*',
         'x-pack/test/ui_capabilities/*/tests/**/*',
+        'x-pack/test/performance/**/*.ts',
       ],
       rules: {
         'import/no-default-export': 'off',

.github/CODEOWNERS

@@ -72,6 +72,7 @@
 /src/plugins/navigation/ @elastic/kibana-app-services
 /src/plugins/share/ @elastic/kibana-app-services
 /src/plugins/ui_actions/ @elastic/kibana-app-services
+/src/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
 /src/plugins/data_view_field_editor @elastic/kibana-app-services
 /src/plugins/screenshot_mode @elastic/kibana-app-services
 /src/plugins/bfetch/ @elastic/kibana-app-services
@@ -80,7 +81,6 @@
 /src/plugins/unified_search/ @elastic/kibana-app-services
 /x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-services
 /x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
-/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/runtime_fields @elastic/kibana-app-services
 /x-pack/test/search_sessions_integration/ @elastic/kibana-app-services
 /src/plugins/dashboard/public/application/embeddable/viewport/print_media @elastic/kibana-app-services
@@ -141,6 +141,8 @@
 /x-pack/test/functional/es_archives/uptime @elastic/uptime
 /x-pack/test/functional/services/uptime @elastic/uptime
 /x-pack/test/api_integration/apis/uptime @elastic/uptime
+/x-pack/plugins/observability/public/components/shared/exploratory_view @elastic/uptime
+
 
 # Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
 /x-pack/plugins/apm/public/application/uxApp.tsx @elastic/uptime

.i18nrc.json

@@ -77,6 +77,7 @@
       "src/plugins/vis_types/timelion"
     ],
     "uiActions": "src/plugins/ui_actions",
+    "uiActionsEnhanced": "src/plugins/ui_actions_enhanced",
     "uiActionsExamples": "examples/ui_action_examples",
     "usageCollection": "src/plugins/usage_collection",
     "utils": "packages/kbn-securitysolution-utils/src",

dev_docs/contributing/how_we_use_github.mdx

@@ -131,7 +131,7 @@ would be useful to all teams, talk to your team or tech lead about getting it ad
 
 ### Team labels
 
-Examples: `Team:Security`, `Team:Operations`.
+Examples: `Team:Security`, `Team:Operations`, `Team:Docs`.
 
 These labels map the issue to the team that owns the particular area. Part of the responsibilities of
 (todo) is to ensure every issue has at least a team or a project
@@ -178,3 +178,37 @@ it might mean the version the team is tentatively planning to merge a fix.
 
 Consult the owning team if you have a question about how a version label is meant
 to be used on an issue.
+
+### Issue type and workflow labels
+
+These labels categorize the type of work. For example:
+
+- `blocked`: Indicates the issue is currently blocked
+- `blocker`: Indicates that we should not release the product at the next
+   proposed version without the issue being resolved
+- `bug`: Indicates an unexpected problem or unintended behavior
+- `discuss`: Indicates that an issue is a discussion topic
+- `docs`/`documentation`: Indicates improvements or additions to documentation
+- `enhancement`: Indicates new feature or enhancement requests
+- `meta`: Indicates that the issue tracks tasks related to a project
+- `triage-needed`: Indicates that someone from the area team needs to investigate.
+- `needs_team`: Indicates that issue is missing area team label. All issues should be assigned to one or more area teams for follow up. This label is assigned automatically and removed automatically once a team label is added.
+
+These labels affect whether your PR appears in the release notes (that is to say,
+it's notable and affects our users) and which section it appears in. For example:
+
+- `release_note:breaking`: Specifies a breaking change and adds the PR to the Breaking changes section in the release notes
+- `release_note:deprecation`: Specifies a deprecated feature and adds the PR to the Deprecations section in the release notes
+- `release_note:enhancement`: Specifies a feature enhancement and adds the PR to the Enhancements section in the release notes
+- `release_note:feature`: Specifies a new feature and adds the PR to the  Features section in the release notes
+- `release_note:fix`: Specifies a bug fix and adds the PR to the Bug fixes section in the release notes
+- `release_node:plugin_api_changes`: Specifies a changes to the plugin API and adds the PR to the Plugin API changes page in the Developer Guide
+- `release_note:skip`: Omits the PR from release notes
+
+These labels related to backporting PRs:
+
+- `auto-backport`: Automatically backport this PR (to the branches related to
+   version labels) after it's merged
+- `backport`: This PR was backported
+- `backport:skip`: This PR does not require backporting
+

dev_docs/getting_started/troubleshooting.mdx

@@ -40,3 +40,12 @@ it means you are using a new Elasticsearch feature that will not work in a CCS e
 We added this test coverage in version `8.1` because we accidentally broke core Kibana features (for example, when Discover started using the new fields parameter) for our CCS users. CCS is not a corner case and (excluding certain experimental features) Kibana should always work for our CCS users. This setting is our way of ensuring test coverage.
 
 Please reach out to the [Kibana Operations team](https://github.com/orgs/elastic/teams/kibana-operations) if you have further questions.
+
+### Minified React errors
+
+If you experience minified React errors and want to expand them to their full error messages you will currently need to rebuild the `@kbn/ui-shared-deps-npm` package using "development" mode instead of "production", which can be done by modifying the corresponding line in `packages/kbn-ui-shared-deps-npm/webpack.config.js` and make sure to run `yarn kbn bootstrap` afterwards:
+
+```diff
+-    mode: 'production',
++    mode: 'development',
+```

dev_docs/operations/operations_landing.mdx

@@ -28,6 +28,7 @@ layout: landing
     { pageId: "kibDevDocsOpsBabelPluginSyntheticPackages" },
     { pageId: "kibDevDocsOpsUiSharedDepsNpm" },
     { pageId: "kibDevDocsOpsUiSharedDepsSrc" },
+    { pageId: "kibDevDocsOpsPluginDiscovery" },
   ]}
 />
 
@@ -50,5 +51,7 @@ layout: landing
     { pageId: "kibDevDocsOpsAmbientUiTypes" },
     { pageId: "kibDevDocsOpsTestSubjSelector" },
     { pageId: "kibDevDocsOpsBazelRunner" },
+    { pageId: "kibDevDocsOpsCliDevMode" },
+    { pageId: "kibDevDocsOpsEs" },
   ]}
 />

dev_docs/tutorials/advanced_settings.mdx

@@ -286,3 +286,13 @@ export const migrations = {
 };
 ```
 [1] Since all `uiSettings` migrations are added to the same migration function, while not required, grouping settings by team is good practice.
+
+### Creating Transforms
+
+If you have need to make a change that isn't possible in a saved object migration function (for example, you need to find other saved
+objects), you can create a transform function instead. This will be applied when a `config` saved object is first created, and/or when it is
+first upgraded. Note that you might need to add an extra attribute to verify that this transform has already been applied so it doesn't get
+applied again in the future.
+
+For example, we needed to transform the `defaultIndex` attribute, and we added an extra `isDefaultIndexMigrated` attribute for this purpose.
+See `src/core/server/ui_settings/saved_objects/transforms.ts` and [#13339](https://github.com/elastic/kibana/pull/133339) for an example.

docs/api/actions-and-connectors.asciidoc

@@ -28,7 +28,7 @@ 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/update.asciidoc[]
+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[]