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][Detection Engine] enable xMatters, Server Log connectors for Security #172933

Merged
merged 8 commits into from
May 15, 2024
Merged

[Security Solution][Detection Engine] enable xMatters, Server Log connectors for Security #172933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
51ef016
[Security Solution][Detection Engine] enable xMatters, Server Log con…
vitaliidm Dec 8, 2023
779da0c
Merge branch 'main' into de-8-13/enable-additional-connectors
vitaliidm May 9, 2024
e8ef9f9
Merge branch 'main' into de-8-13/enable-additional-connectors
vitaliidm May 9, 2024
b066243
add cypress tests
vitaliidm May 9, 2024
3ecdc99
Update rule_actions_pli_essentials.cy.ts
vitaliidm May 9, 2024
beee520
Merge branch 'main' into de-8-13/enable-additional-connectors
vitaliidm May 9, 2024
f655fe8
Merge branch 'main' into de-8-13/enable-additional-connectors
vitaliidm May 9, 2024
6f26764
Merge branch 'main' into de-8-13/enable-additional-connectors
vitaliidm May 15, 2024
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
7 changes: 6 additions & 1 deletion x-pack/plugins/stack_connectors/server/connector_types/server_log/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type {
import {
AlertingConnectorFeatureId,
UptimeConnectorFeatureId,
SecurityConnectorFeatureId,
} from '@kbn/actions-plugin/common/connector_feature_config';
import { withoutControlCharacters } from '../lib/string_utils';

Expand Down Expand Up @@ -55,7 +56,11 @@ export function getConnectorType(): ServerLogConnectorType {
name: i18n.translate('xpack.stackConnectors.serverLog.title', {
defaultMessage: 'Server log',
}),
supportedFeatureIds: [AlertingConnectorFeatureId, UptimeConnectorFeatureId],
supportedFeatureIds: [
AlertingConnectorFeatureId,
UptimeConnectorFeatureId,
SecurityConnectorFeatureId,
],
validate: {
config: { schema: schema.object({}, { defaultValue: {} }) },
secrets: { schema: schema.object({}, { defaultValue: {} }) },
Expand Down
7 changes: 5 additions & 2 deletions x-pack/plugins/stack_connectors/server/connector_types/xmatters/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import type {
ActionTypeExecutorResult as ConnectorTypeExecutorResult,
ValidatorServices,
} from '@kbn/actions-plugin/server/types';
import { AlertingConnectorFeatureId } from '@kbn/actions-plugin/common/types';
import {
AlertingConnectorFeatureId,
SecurityConnectorFeatureId,
} from '@kbn/actions-plugin/common/types';
import { postXmatters } from './post_xmatters';

export type XmattersConnectorType = ConnectorType<
Expand Down Expand Up @@ -66,7 +69,7 @@ export function getConnectorType(): XmattersConnectorType {
name: i18n.translate('xpack.stackConnectors.xmatters.title', {
defaultMessage: 'xMatters',
}),
supportedFeatureIds: [AlertingConnectorFeatureId],
supportedFeatureIds: [AlertingConnectorFeatureId, SecurityConnectorFeatureId],
validate: {
config: {
schema: ConfigSchema,
Expand Down
4 changes: 4 additions & 0 deletions ...ress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_complete.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
SLACK_ACTION_BTN,
WEBHOOK_ACTION_BTN,
EMAIL_ACTION_BTN,
SERVER_LOG_ACTION_BTN,
XMATTERS_ACTION_BTN,
ACTION_BTN,
} from '../../../../screens/common/rule_actions';

Expand Down Expand Up @@ -62,6 +64,8 @@ describe(
cy.get(SLACK_ACTION_BTN).should('be.visible');
cy.get(EMAIL_ACTION_BTN).should('be.visible');
cy.get(WEBHOOK_ACTION_BTN).should('be.visible');
cy.get(SERVER_LOG_ACTION_BTN).should('be.visible');
cy.get(XMATTERS_ACTION_BTN).should('be.visible');
});
}
);
6 changes: 5 additions & 1 deletion ...ss/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_essentials.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
SLACK_ACTION_BTN,
WEBHOOK_ACTION_BTN,
EMAIL_ACTION_BTN,
XMATTERS_ACTION_BTN,
SERVER_LOG_ACTION_BTN,
ACTION_BTN,
} from '../../../../screens/common/rule_actions';

Expand Down Expand Up @@ -62,8 +64,10 @@ describe(
cy.get(SLACK_ACTION_BTN).should('be.visible');
cy.get(EMAIL_ACTION_BTN).should('be.visible');

// webhook is not available
// complete tier actions are not available
cy.get(WEBHOOK_ACTION_BTN).should('not.exist');
cy.get(XMATTERS_ACTION_BTN).should('not.exist');
cy.get(SERVER_LOG_ACTION_BTN).should('not.exist');
});
}
);
4 changes: 4 additions & 0 deletions x-pack/test/security_solution_cypress/cypress/screens/common/rule_actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ export const EMAIL_ACTION_BTN = '[data-test-subj=".email-siem-ActionTypeSelectOp

export const WEBHOOK_ACTION_BTN = '[data-test-subj=".webhook-siem-ActionTypeSelectOption"]';

export const SERVER_LOG_ACTION_BTN = '[data-test-subj=".server-log-siem-ActionTypeSelectOption"]';

export const XMATTERS_ACTION_BTN = '[data-test-subj=".xmatters-siem-ActionTypeSelectOption"]';

/**
* all rule actions buttons, elements which data-test-subj attribute ends with '-siem-ActionTypeSelectOption'
*/
Expand Down