remove uneeded indices, remove preventNotify option

elastic · Jul 2, 2020 · 3de9ca3 · 3de9ca3
1 parent 3305b22
commit 3de9ca3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 45 deletions.
diff --git a/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts b/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts
@@ -30,11 +30,6 @@ export const factory = (): PolicyConfig => {
       },
       advanced: {
         elasticsearch: {
-          indices: {
-            control: 'control-index',
-            event: 'event-index',
-            logging: 'logging-index',
-          },
           kernel: {
             connect: true,
             process: true,
@@ -49,19 +44,14 @@ export const factory = (): PolicyConfig => {
         network: true,
       },
       malware: {
-        mode: ProtectionModes.detect,
+        mode: ProtectionModes.prevent,
       },
       logging: {
         stdout: 'debug',
         file: 'info',
       },
       advanced: {
         elasticsearch: {
-          indices: {
-            control: 'control-index',
-            event: 'event-index',
-            logging: 'logging-index',
-          },
           kernel: {
             connect: true,
             process: true,
@@ -81,11 +71,6 @@ export const factory = (): PolicyConfig => {
       },
       advanced: {
         elasticsearch: {
-          indices: {
-            control: 'control-index',
-            event: 'event-index',
-            logging: 'logging-index',
-          },
           kernel: {
             connect: true,
             process: true,

diff --git a/x-pack/plugins/security_solution/common/endpoint/types.ts b/x-pack/plugins/security_solution/common/endpoint/types.ts
@@ -644,11 +644,6 @@ export interface UIPolicyConfig {
 
 interface PolicyConfigAdvancedOptions {
   elasticsearch: {
-    indices: {
-      control: string;
-      event: string;
-      logging: string;
-    };
     kernel: {
       connect: boolean;
       process: boolean;
@@ -665,7 +660,6 @@ export interface MalwareFields {
 export enum ProtectionModes {
   detect = 'detect',
   prevent = 'prevent',
-  preventNotify = 'preventNotify',
   off = 'off',
 }
 

diff --git a/...ecurity_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx b/...ecurity_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
@@ -95,13 +95,6 @@ export const MalwareProtections = React.memo(() => {
         }),
         protection: 'malware',
       },
-      {
-        id: ProtectionModes.preventNotify,
-        label: i18n.translate('xpack.securitySolution.endpoint.policy.details.preventAndNotify', {
-          defaultMessage: 'Prevent and notify user',
-        }),
-        protection: 'malware',
-      },
     ];
   }, []);
 

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -120,11 +120,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
                 linux: {
                   advanced: {
                     elasticsearch: {
-                      indices: {
-                        control: 'control-index',
-                        event: 'event-index',
-                        logging: 'logging-index',
-                      },
                       kernel: { connect: true, process: true },
                     },
                   },
@@ -134,26 +129,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
                 mac: {
                   advanced: {
                     elasticsearch: {
-                      indices: {
-                        control: 'control-index',
-                        event: 'event-index',
-                        logging: 'logging-index',
-                      },
                       kernel: { connect: true, process: true },
                     },
                   },
                   events: { file: false, network: true, process: true },
                   logging: { file: 'info', stdout: 'debug' },
-                  malware: { mode: 'detect' },
+                  malware: { mode: 'prevent' },
                 },
                 windows: {
                   advanced: {
                     elasticsearch: {
-                      indices: {
-                        control: 'control-index',
-                        event: 'event-index',
-                        logging: 'logging-index',
-                      },
                       kernel: { connect: true, process: true },
                     },
                   },