Merge branch 'main' into force-time-shift

.buildkite/scripts/steps/code_generation/security_solution_codegen.sh

@@ -6,7 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 echo --- Security Solution OpenAPI Code Generation
 
-echo -e "\n[Security Solution OpenAPI Code Generation] OpenAPI Common Package"
+echo -e "\n[Security Solution OpenAPI Code Generation] OpenAPI Common Package\n"
 
 (cd packages/kbn-openapi-common && yarn openapi:generate)
 check_for_changed_files "yarn openapi:generate" true
@@ -16,12 +16,12 @@ echo -e "\n[Security Solution OpenAPI Code Generation] Lists Common Package\n"
 (cd packages/kbn-securitysolution-lists-common && yarn openapi:generate)
 check_for_changed_files "yarn openapi:generate" true
 
-echo -e "\n[Security Solution OpenAPI Code Generation] Exceptions Common Package"
+echo -e "\n[Security Solution OpenAPI Code Generation] Exceptions Common Package\n"
 
 (cd packages/kbn-securitysolution-exceptions-common && yarn openapi:generate)
 check_for_changed_files "yarn openapi:generate" true
 
-echo -e "\n[Security Solution OpenAPI Code Generation] Security Solution Plugin"
+echo -e "\n[Security Solution OpenAPI Code Generation] Security Solution Plugin\n"
 
 (cd x-pack/plugins/security_solution && yarn openapi:generate)
 check_for_changed_files "yarn openapi:generate" true

.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh

@@ -11,6 +11,11 @@ echo -e "\n[Security Solution OpenAPI Bundling] Detections API\n"
 (cd x-pack/plugins/security_solution && yarn openapi:bundle:detections)
 check_for_changed_files "yarn openapi:bundle:detections" true
 
+echo -e "\n[Security Solution OpenAPI Bundling] Timeline API\n"
+
+(cd x-pack/plugins/security_solution && yarn openapi:bundle:timeline)
+check_for_changed_files "yarn openapi:bundle:timeline" true
+
 echo -e "\n[Security Solution OpenAPI Bundling] Entity Analytics API\n"
 
 (cd x-pack/plugins/security_solution && yarn openapi:bundle:entity-analytics)

.github/CODEOWNERS

@@ -503,7 +503,7 @@ x-pack/plugins/observability_solution/infra @elastic/obs-ux-logs-team @elastic/o
 x-pack/plugins/ingest_pipelines @elastic/kibana-management
 src/plugins/input_control_vis @elastic/kibana-presentation
 src/plugins/inspector @elastic/kibana-presentation
-x-pack/plugins/integration_assistant @elastic/security-solution
+x-pack/plugins/integration_assistant @elastic/security-scalability
 src/plugins/interactive_setup @elastic/kibana-security
 test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-security
 packages/kbn-interpreter @elastic/kibana-visualizations

packages/kbn-alerting-types/index.ts

@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
-export * from './builtin_action_groups_types';
-export * from './rule_type_types';
 export * from './action_group_types';
+export * from './action_variable';
 export * from './alert_type';
-export * from './rule_notify_when_type';
-export * from './r_rule_types';
-export * from './rule_types';
 export * from './alerting_framework_health_types';
-export * from './action_variable';
+export * from './builtin_action_groups_types';
 export * from './circuit_breaker_message_header';
+export * from './r_rule_types';
+export * from './rule_notify_when_type';
+export * from './search_strategy_types';
+export * from './rule_type_types';
+export * from './rule_types';

x-pack/plugins/rule_registry/common/search_strategy/index.ts → packages/kbn-alerting-types/search_strategy_types.ts

@@ -1,17 +1,20 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
-import { TechnicalRuleDataFieldName, ValidFeatureId } from '@kbn/rule-data-utils';
-import { IEsSearchRequest, IEsSearchResponse } from '@kbn/search-types';
+
+import type { IEsSearchRequest, IEsSearchResponse } from '@kbn/search-types';
+import type { ValidFeatureId } from '@kbn/rule-data-utils';
 import type {
   MappingRuntimeFields,
   QueryDslFieldAndFormat,
   QueryDslQueryContainer,
   SortCombinations,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { Alert } from './alert_type';
 
 export type RuleRegistrySearchRequest = IEsSearchRequest & {
   featureIds: ValidFeatureId[];
@@ -27,20 +30,10 @@ export interface RuleRegistrySearchRequestPagination {
   pageSize: number;
 }
 
-export interface BasicFields {
-  _id: string;
-  _index: string;
-}
-export type EcsFieldsResponse = BasicFields & {
-  [Property in TechnicalRuleDataFieldName]?: string[];
-} & {
-  [x: string]: unknown[];
-};
-
 export interface RuleRegistryInspect {
   dsl: string[];
 }
 
-export interface RuleRegistrySearchResponse extends IEsSearchResponse<EcsFieldsResponse> {
+export interface RuleRegistrySearchResponse extends IEsSearchResponse<Alert> {
   inspect?: RuleRegistryInspect;
 }

packages/kbn-alerting-types/tsconfig.json

@@ -21,6 +21,7 @@
     "@kbn/rule-data-utils",
     "@kbn/rrule",
     "@kbn/core",
-    "@kbn/es-query"
+    "@kbn/es-query",
+    "@kbn/search-types"
   ]
 }