diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts index a9cf3e4a8132e..cffba49aac6c3 100644 --- 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/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts index 5f0749b6788a5..463d75f8d5bce 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts +++ b/x-pack/plugins/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/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts index 2f75d73455656..7104a739e5d76 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts +++ b/x-pack/plugins/security_solution/server/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/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts index d7df4f6e4955e..fe2da6ee18696 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts +++ b/x-pack/plugins/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 => { - 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/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts index fcd4fd2c7c1a2..26512187010e9 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts +++ b/x-pack/plugins/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/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts index 2722f31f3eacd..fb4be16c7d51f 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts +++ b/x-pack/plugins/security_solution/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/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts index f7fb8a69fb089..e7eda05f02f97 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts +++ b/x-pack/plugins/security_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 => {