Remove securityRulesCancelEnabled setting and set shorter default tim…

…eouts (#129769) (#130048) (cherry picked from commit 5fb9576) Co-authored-by: Marshall Main <55718608+marshallmain@users.noreply.github.com>
elastic · Apr 12, 2022 · 4428b67 · 4428b67
1 parent 64b05e6
commit 4428b67
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 8 deletions.
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -22,7 +22,6 @@ export const allowedExperimentalValues = Object.freeze({
   disableIsolationUIPendingStatuses: false,
   riskyHostsEnabled: false,
   riskyUsersEnabled: false,
-  securityRulesCancelEnabled: false,
   pendingActionResponsesWithAck: true,
   policyListEnabled: true,
 

diff --git a/...ins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts b/...ins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts
@@ -20,7 +20,6 @@ export const createEqlAlertType = (
   return {
     id: EQL_RULE_TYPE_ID,
     name: 'Event Correlation Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {

diff --git a/...rver/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts b/...rver/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts
@@ -20,7 +20,7 @@ export const createIndicatorMatchAlertType = (
   return {
     id: INDICATOR_RULE_TYPE_ID,
     name: 'Indicator Match Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
+    ruleTaskTimeout: '1h',
     validate: {
       params: {
         validate: (object: unknown) => {

diff --git a/...ugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts b/...ugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts
@@ -16,11 +16,10 @@ import { CreateRuleOptions, SecurityAlertType } from '../types';
 export const createMlAlertType = (
   createOptions: CreateRuleOptions
 ): SecurityAlertType<MachineLearningRuleParams, {}, {}, 'default'> => {
-  const { logger, ml, experimentalFeatures } = createOptions;
+  const { logger, ml } = createOptions;
   return {
     id: ML_RULE_TYPE_ID,
     name: 'Machine Learning Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {

diff --git a/...security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts b/...security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts
@@ -20,7 +20,6 @@ export const createQueryAlertType = (
   return {
     id: QUERY_RULE_TYPE_ID,
     name: 'Custom Query Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {

diff --git a/...ution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts b/...ution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts
@@ -24,7 +24,6 @@ export const createSavedQueryAlertType = (
   return {
     id: SAVED_QUERY_RULE_TYPE_ID,
     name: 'Saved Query Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {

diff --git a/..._solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts b/..._solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts
@@ -21,7 +21,6 @@ export const createThresholdAlertType = (
   return {
     id: THRESHOLD_RULE_TYPE_ID,
     name: 'Threshold Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown): ThresholdRuleParams => {