[Response Ops][Alerting] Removing lifecycle executor from rule regist…

…ry (elastic#192576) ## Summary All lifecycle rule types have been migrated to use the alerting framework alerts client so the lifecycle executor in the rule registry can be removed since it is no longer in use. Co-authored-by: Elastic Machine <[email protected]>
nreese · Nov 1, 2024 · 1192761 · 1192761
1 parent 02d4c12
commit 1192761
Show file tree

Hide file tree

Showing 25 changed files with 74 additions and 4,389 deletions.
diff --git a/...erver/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.test.ts b/...erver/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.test.ts
@@ -6,14 +6,7 @@
  */
 
 import rison from '@kbn/rison';
-import {
-  AlertInstanceContext as AlertContext,
-  AlertInstanceState as AlertState,
-} from '@kbn/alerting-plugin/server';
 import { RuleExecutorServicesMock, alertsMock } from '@kbn/alerting-plugin/server/mocks';
-import { LifecycleAlertServices } from '@kbn/rule-registry-plugin/server';
-import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
-import { createLifecycleRuleExecutorMock } from '@kbn/rule-registry-plugin/server/utils/create_lifecycle_rule_executor_mock';
 import { COMPARATORS } from '@kbn/alerting-comparators';
 import { Aggregators, InventoryMetricConditions } from '../../../../common/alerting/metrics';
 import type { LogMeta, Logger } from '@kbn/logging';
@@ -150,9 +143,7 @@ const mockLibs = {
     infraPluginMock.createStartContract(),
   ],
   configuration: createMockStaticConfiguration({}),
-  metricsRules: {
-    createLifecycleRuleExecutor: createLifecycleRuleExecutorMock,
-  },
+  metricsRules: {},
   basePath: {
     publicBaseUrl: 'http://localhost:5601',
     prepend: (path: string) => path,
@@ -165,14 +156,10 @@ const mockLibs = {
   logger,
 } as unknown as InfraBackendLibs;
 const alerts = new Map<string, AlertTestInstance>();
-let services: RuleExecutorServicesMock & LifecycleAlertServices<AlertState, AlertContext, string>;
+let services: RuleExecutorServicesMock;
 
 const setup = () => {
-  const alertsServices = alertsMock.createRuleExecutorServices();
-  services = {
-    ...alertsServices,
-    ...ruleRegistryMocks.createLifecycleAlertServices(alertsServices),
-  };
+  services = alertsMock.createRuleExecutorServices();
 
   services.alertsClient.report.mockImplementation((params: any) => {
     alerts.set(params.id, { actionGroup: params.actionGroup, context: [], payload: [] });

diff --git a/x-pack/plugins/observability_solution/infra/server/services/rules/rules_service.ts b/x-pack/plugins/observability_solution/infra/server/services/rules/rules_service.ts
@@ -6,7 +6,6 @@
  */
 
 import { CoreSetup, Logger } from '@kbn/core/server';
-import { createLifecycleExecutor } from '@kbn/rule-registry-plugin/server';
 import { InfraFeatureId } from '../../../common/constants';
 import { createRuleDataClient } from './rule_data_client';
 import {
@@ -36,12 +35,7 @@ export class RulesService {
       ruleDataService: setupDeps.ruleRegistry.ruleDataService,
     });
 
-    const createLifecycleRuleExecutor = createLifecycleExecutor(this.logger, ruleDataClient);
-
-    return {
-      createLifecycleRuleExecutor,
-      ruleDataClient,
-    };
+    return { ruleDataClient };
   }
 
   public start(_startDeps: RulesServiceStartDeps): RulesServiceStart {

diff --git a/x-pack/plugins/observability_solution/infra/server/services/rules/types.ts b/x-pack/plugins/observability_solution/infra/server/services/rules/types.ts
@@ -6,13 +6,7 @@
  */
 
 import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
-import {
-  createLifecycleExecutor,
-  IRuleDataClient,
-  RuleRegistryPluginSetupContract,
-} from '@kbn/rule-registry-plugin/server';
-
-type LifecycleRuleExecutorCreator = ReturnType<typeof createLifecycleExecutor>;
+import { IRuleDataClient, RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 export interface RulesServiceSetupDeps {
   alerting: AlertingPluginSetup;
   ruleRegistry: RuleRegistryPluginSetupContract;
@@ -22,7 +16,6 @@ export interface RulesServiceSetupDeps {
 export interface RulesServiceStartDeps {}
 
 export interface RulesServiceSetup {
-  createLifecycleRuleExecutor: LifecycleRuleExecutorCreator;
   ruleDataClient: IRuleDataClient;
 }
 

diff --git a/x-pack/plugins/rule_registry/server/index.ts b/x-pack/plugins/rule_registry/server/index.ts
@@ -25,13 +25,6 @@ export * from './rule_data_plugin_service';
 export * from './rule_data_client';
 export * from './alert_data_client/audit_events';
 
-export { createLifecycleRuleTypeFactory } from './utils/create_lifecycle_rule_type_factory';
-export type {
-  LifecycleRuleExecutor,
-  LifecycleAlertService,
-  LifecycleAlertServices,
-} from './utils/create_lifecycle_executor';
-export { createLifecycleExecutor } from './utils/create_lifecycle_executor';
 export { createPersistenceRuleTypeWrapper } from './utils/create_persistence_rule_type_wrapper';
 export * from './utils/persistence_types';
 export type { AlertsClient } from './alert_data_client/alerts_client';

diff --git a/x-pack/plugins/rule_registry/server/mocks.ts b/x-pack/plugins/rule_registry/server/mocks.ts
@@ -11,10 +11,8 @@ import {
   ruleDataServiceMock,
   RuleDataServiceMock,
 } from './rule_data_plugin_service/rule_data_plugin_service.mock';
-import { createLifecycleAlertServicesMock } from './utils/lifecycle_alert_services.mock';
 
 export const ruleRegistryMocks = {
-  createLifecycleAlertServices: createLifecycleAlertServicesMock,
   createRuleDataService: ruleDataServiceMock.create,
   createRuleDataClient: createRuleDataClientMock,
   createAlertsClientMock: alertsClientMock,

diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts
@@ -29,7 +29,6 @@ import type {
   PluginSetup as DataPluginSetup,
 } from '@kbn/data-plugin/server';
 
-import { createLifecycleRuleTypeFactory } from './utils/create_lifecycle_rule_type_factory';
 import type { RuleRegistryPluginConfig } from './config';
 import { type IRuleDataService, RuleDataService, Dataset } from './rule_data_plugin_service';
 import { AlertsClientFactory } from './alert_data_client/alerts_client_factory';
@@ -52,7 +51,6 @@ export interface RuleRegistryPluginStartDependencies {
 
 export interface RuleRegistryPluginSetupContract {
   ruleDataService: IRuleDataService;
-  createLifecycleRuleTypeFactory: typeof createLifecycleRuleTypeFactory;
   dataset: typeof Dataset;
 }
 
@@ -153,7 +151,6 @@ export class RuleRegistryPlugin
 
     return {
       ruleDataService: this.ruleDataService,
-      createLifecycleRuleTypeFactory,
       dataset: Dataset,
     };
   }