resolve merge conflicts after rebase with master

x-pack/plugins/apm/server/plugin.ts

@@ -18,7 +18,6 @@ import {
 import { mapValues, once } from 'lodash';
 import { TECHNICAL_COMPONENT_TEMPLATE_NAME } from '../../rule_registry/common/assets';
 import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { RuleDataClient } from '../../rule_registry/server';
 import { APMConfig, APMXPackConfig, APM_SERVER_FEATURE_ID } from '.';
 import { mergeConfigs } from './index';
 import { UI_SETTINGS } from '../../../../src/plugins/data/common';
@@ -184,6 +183,7 @@ export class APMPlugin
     );
 
     const ruleDataClient = ruleDataService.getRuleDataClient(
+      APM_SERVER_FEATURE_ID,
       ruleDataService.getFullAssetName('observability-apm'),
       () => initializeRuleDataTemplatesPromise
     );
@@ -202,7 +202,7 @@ export class APMPlugin
     }) as APMRouteHandlerResources['plugins'];
 
     const telemetryUsageCounter = resourcePlugins.usageCollection?.setup.createUsageCounter(
-      'apm'
+      APM_SERVER_FEATURE_ID
     );
 
     registerRoutes({

x-pack/plugins/observability/server/plugin.ts

@@ -99,6 +99,7 @@ export class ObservabilityPlugin implements Plugin<ObservabilityPluginSetup> {
     const start = () => core.getStartServices().then(([coreStart]) => coreStart);
 
     const ruleDataClient = plugins.ruleRegistry.ruleDataService.getRuleDataClient(
+      'observability',
       plugins.ruleRegistry.ruleDataService.getFullAssetName(),
       () => Promise.resolve()
     );

x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts

@@ -18,6 +18,7 @@ import { defaultLifecyclePolicy } from '../../common/assets/lifecycle_policies/d
 import { ClusterPutComponentTemplateBody, PutIndexTemplateRequest } from '../../common/types';
 import { RuleDataClient } from '../rule_data_client';
 import { RuleDataWriteDisabledError } from './errors';
+import { ValidFeatureId } from '../utils/rbac';
 
 const BOOTSTRAP_TIMEOUT = 60000;
 
@@ -52,11 +53,8 @@ function createSignal() {
 
 export class RuleDataPluginService {
   signal = createSignal();
-  private readonly fullAssetName;
 
-  constructor(private readonly options: RuleDataPluginServiceConstructorOptions) {
-    this.fullAssetName = options.index;
-  }
+  constructor(private readonly options: RuleDataPluginServiceConstructorOptions) {}
 
   private assertWriteEnabled() {
     if (!this.isWriteEnabled()) {
@@ -158,6 +156,16 @@ export class RuleDataPluginService {
   }
 
   getFullAssetName(assetName?: string) {
-    return [this.fullAssetName, assetName].filter(Boolean).join('-');
+    return [this.options.index, assetName].filter(Boolean).join('-');
+  }
+
+  getRuleDataClient(feature: ValidFeatureId, alias: string, initialize: () => Promise<void>) {
+    return new RuleDataClient({
+      alias,
+      feature,
+      getClusterClient: () => this.getClusterClient(),
+      isWriteEnabled: this.isWriteEnabled(),
+      ready: initialize,
+    });
   }
 }

x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock.ts

@@ -20,6 +20,7 @@ const createRuleDataPluginServiceMock = (_: RuleDataPluginServiceConstructorOpti
     createOrUpdateComponentTemplate: jest.fn(),
     createOrUpdateIndexTemplate: jest.fn(),
     createOrUpdateLifecyclePolicy: jest.fn(),
+    getRuleDataClient: jest.fn(),
   };
   return mocked;
 };

x-pack/plugins/security_solution/server/plugin.ts

@@ -237,6 +237,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       });
 
       ruleDataClient = ruleDataService.getRuleDataClient(
+        SERVER_APP_ID,
         ruleDataService.getFullAssetName('security-solution'),
         () => initializeRuleDataTemplatesPromise
       );