Merge branch '8.x' into backport/8.x/pr-196953

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

@@ -218,7 +218,7 @@ steps:
               limit: 1
 
       - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-        label: "Serverless Osquery Cypress Tests"
+        label: "Osquery Cypress Tests on Serverless"
         if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
         agents:
           image: family/kibana-ubuntu-2004

.buildkite/pipelines/pointer_compression.yml

@@ -339,7 +339,7 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
-    label: 'Serverless Osquery Cypress Tests'
+    label: 'Osquery Cypress Tests on Serverless'
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod

.buildkite/scripts/steps/checks.sh

@@ -12,6 +12,4 @@ fi
 .buildkite/scripts/steps/checks/saved_objects_definition_change.sh
 .buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
 .buildkite/scripts/steps/code_generation/security_solution_codegen.sh
-.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
 .buildkite/scripts/steps/code_generation/osquery_codegen.sh
-.buildkite/scripts/steps/openapi_bundling/final_merge.sh

.buildkite/scripts/steps/checks/capture_oas_snapshot.sh

@@ -23,3 +23,6 @@ run_check() {
 retry 5 15 run_check
 
 check_for_changed_files "$cmd" true
+
+.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
+.buildkite/scripts/steps/openapi_bundling/final_merge.sh

.buildkite/scripts/steps/openapi_bundling/final_merge.sh

@@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
 echo --- Merge Kibana OpenAPI specs
 
 (cd oas_docs && make api-docs && make api-docs-lint)
-(cd oas_docs && make api-docs-staging && make api-docs-lint)
 
-check_for_changed_files "make api-docs && make api-docs-staging" true
+check_for_changed_files "make api-docs" true

.github/CODEOWNERS

@@ -385,6 +385,7 @@ packages/kbn-dev-proc-runner @elastic/kibana-operations
 src/plugins/dev_tools @elastic/kibana-management
 packages/kbn-dev-utils @elastic/kibana-operations
 examples/developer_examples @elastic/appex-sharedux
+packages/kbn-discover-contextual-components @elastic/obs-ux-logs-team @elastic/kibana-data-discovery
 examples/discover_customization_examples @elastic/kibana-data-discovery
 x-pack/plugins/discover_enhanced @elastic/kibana-data-discovery
 src/plugins/discover @elastic/kibana-data-discovery

.i18nrc.json

@@ -27,7 +27,7 @@
     "dataViews": "src/plugins/data_views",
     "defaultNavigation": "packages/default-nav",
     "devTools": "src/plugins/dev_tools",
-    "discover": ["src/plugins/discover", "packages/kbn-discover-utils"],
+    "discover": ["src/plugins/discover", "packages/kbn-discover-utils", "packages/kbn-discover-contextual-components"],
     "savedSearch": "src/plugins/saved_search",
     "embeddableApi": "src/plugins/embeddable",
     "presentationPanel": "src/plugins/presentation_panel",

oas_docs/makefile

@@ -18,21 +18,16 @@ api-docs: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi
 	@node scripts/merge_serverless_oas.js
 	@node scripts/merge_ess_oas.js
 
-.PHONY: api-docs-staging
-api-docs-staging: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi-bundler
-	@node scripts/merge_serverless_oas_staging.js
-	@node scripts/merge_ess_oas_staging.js
-
 .PHONY: api-docs-stateful
 api-docs-stateful: ## Generate only kibana.yaml
 	@node scripts/merge_ess_oas.js
 
 .PHONY: api-docs-serverless
 api-docs-serverless: ## Generate only kibana.serverless.yaml
 	@node scripts/merge_serverless_oas.js
-	
+
 .PHONY: api-docs-lint
-api-docs-lint: ## Run spectral API docs linter 
+api-docs-lint: ## Run spectral API docs linter
 	@npx @stoplight/spectral-cli lint "output/*.yaml" --ruleset ".spectral.yaml"
 
 .PHONY: api-docs-lint-errs