Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Security Solution][Detections] Fix 409 conflict error happening when user enables a rule #120088

Merged
merged 1 commit into from
Dec 1, 2021
Merged

[Security Solution][Detections] Fix 409 conflict error happening when user enables a rule #120088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...s/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ export const performBulkActionRoute = (
await enableRule({
rule,
rulesClient,
ruleStatusClient,
spaceId: context.securitySolution.getSpaceId(),
});
}
})
Expand Down
20 changes: 1 addition & 19 deletions x-pack/plugins/security_solution/server/lib/detection_engine/rules/enable_rule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,19 @@

import { SanitizedAlert } from '../../../../../alerting/common';
import { RulesClient } from '../../../../../alerting/server';
import { RuleExecutionStatus } from '../../../../common/detection_engine/schemas/common/schemas';
import { IRuleExecutionLogClient } from '../rule_execution_log/types';
import { RuleParams } from '../schemas/rule_schemas';

interface EnableRuleArgs {
rule: SanitizedAlert<RuleParams>;
rulesClient: RulesClient;
ruleStatusClient: IRuleExecutionLogClient;
spaceId: string;
}

/**
* Enables the rule and updates its status to 'going to run'
*
* @param rule - rule to enable
* @param rulesClient - Alerts client
* @param ruleStatusClient - ExecLog client
*/
export const enableRule = async ({
rule,
rulesClient,
ruleStatusClient,
spaceId,
}: EnableRuleArgs) => {
export const enableRule = async ({ rule, rulesClient }: EnableRuleArgs) => {
await rulesClient.enable({ id: rule.id });

await ruleStatusClient.logStatusChange({
ruleId: rule.id,
ruleName: rule.name,
ruleType: rule.alertTypeId,
spaceId,
newStatus: RuleExecutionStatus['going to run'],
});
};
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export const patchRules = async ({
if (rule.enabled && enabled === false) {
await rulesClient.disable({ id: rule.id });
} else if (!rule.enabled && enabled === true) {
await enableRule({ rule, rulesClient, ruleStatusClient, spaceId });
await enableRule({ rule, rulesClient });
} else {
// enabled is null or undefined and we do not touch the rule
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const updateRules = async ({
if (existingRule.enabled && enabled === false) {
await rulesClient.disable({ id: existingRule.id });
} else if (!existingRule.enabled && enabled === true) {
await enableRule({ rule: existingRule, rulesClient, ruleStatusClient, spaceId });
await enableRule({ rule: existingRule, rulesClient });
}
return { ...update, enabled };
};