fixes merge conflicts and updates logging, defaults to always writing…

… alerts to an index
yctercero · May 12, 2021 · 350aa97 · 350aa97
1 parent 87ac3e9
commit 350aa97
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts
@@ -82,7 +82,7 @@ export class RuleRegistryPlugin implements Plugin<RuleRegistryPluginSetupContrac
       kibanaVersion: this.initContext.env.packageInfo.version,
       logger: logger.get('root'),
       alertingPluginSetupContract: plugins.alerting,
-      writeEnabled: this.config.writeEnabled,
+      writeEnabled: true, // this.config.writeEnabled,
     });
 
     // ALERTS ROUTES

diff --git a/...ck/plugins/rule_registry/server/rule_registry/create_scoped_rule_registry_client/index.ts b/...ck/plugins/rule_registry/server/rule_registry/create_scoped_rule_registry_client/index.ts
@@ -150,6 +150,7 @@ export function createScopedRuleRegistryClient<TFieldMap extends BaseRuleFieldMa
       });
     },
     bulkIndex: (docs) => {
+      logger.debug(`indexAliasName: ${indexAliasName}`);
       const validations = docs.map((doc) => {
         return fieldmapType.decode({
           ...doc,

diff --git a/...ule_registry/server/rule_registry/rule_type_helpers/create_lifecycle_rule_type_factory.ts b/...ule_registry/server/rule_registry/rule_type_helpers/create_lifecycle_rule_type_factory.ts
@@ -73,7 +73,7 @@ export function createLifecycleRuleTypeFactory(): CreateLifecycleRuleType<BaseRu
           rule.uuid
         );
 
-        console.error('RULE REGISTRY CONSUMER', so.attributes.consumer);
+        logger.debug(`RULE REGISTRY CONSUMER ${so.attributes.consumer}`);
 
         const decodedState = wrappedStateRt.decode(previousState);
 
@@ -157,6 +157,8 @@ export function createLifecycleRuleTypeFactory(): CreateLifecycleRuleType<BaseRu
             },
           });
 
+          console.error('EVENTS????', JSON.stringify(events, null, 2));
+
           events.forEach((event) => {
             const alertId = event['kibana.rac.alert.id']!;
             alertsDataMap[alertId] = event;
@@ -218,7 +220,10 @@ export function createLifecycleRuleTypeFactory(): CreateLifecycleRuleType<BaseRu
           }
         );
 
+        logger.debug(`EVENTSTOINDEX: ${JSON.stringify(eventsToIndex, null, 2)}`);
+
         if (eventsToIndex.length && scopedRuleRegistryClient) {
+          logger.debug('ABOUT TO INDEX ALERTS');
           await scopedRuleRegistryClient.bulkIndex(eventsToIndex);
         }
 

diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
@@ -141,6 +141,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
   private readonly config: ConfigType;
   private context: PluginInitializerContext;
   private appClientFactory: AppClientFactory;
+  private setupPlugins?: SetupPlugins;
   private readonly endpointAppContextService = new EndpointAppContextService();
   private readonly telemetryEventsSender: TelemetryEventsSender;
 
@@ -165,6 +166,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
 
   public setup(core: CoreSetup<StartPlugins, PluginStart>, plugins: SetupPlugins) {
     this.logger.debug('plugin setup');
+    this.setupPlugins = plugins;
 
     const config = this.config;
     const globalConfig = this.context.config.legacy.get();
@@ -355,7 +357,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
 
     // Create rule-registry scoped to security-solution (APP_ID uses caps, not supported)
     this.setupPlugins.ruleRegistry = plugins.ruleRegistry.create({
-      namespace: 'security-solution',
+      name: 'security-solution',
       fieldMap: {
         ...pickWithPatterns(ecsFieldMap, 'host.name', 'service.name'),
       },