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.

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] Rename siem plugin to security_solution #67902

Merged
merged 33 commits into from
Jun 4, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
cbc5943
rename siem to security_solution
XavierM Jun 1, 2020
ead68f5
rename siem to security solution inside of code
XavierM Jun 2, 2020
68e4f1d
rename translation keys
XavierM Jun 2, 2020
d48736b
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
2ba9145
fix snapshot
XavierM Jun 3, 2020
f0ee47d
replace siem for security solution in tutorial
XavierM Jun 3, 2020
76762fa
missing translation to be renamed
XavierM Jun 3, 2020
5698af8
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
d3f6299
fix types for api test integration
XavierM Jun 3, 2020
b22fa31
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
df6e7c5
updates runner file to match the new path
MadameSheema Jun 3, 2020
b69a88d
Merge branch 'security-navigation' of https://github.com/XavierM/kiba…
MadameSheema Jun 3, 2020
42cec67
change category for kibana settings
XavierM Jun 3, 2020
3342d4e
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
21c89d0
miss renaming in advance settings
XavierM Jun 3, 2020
2fdb92b
Merge branch 'security-navigation' of github.com:XavierM/kibana into …
XavierM Jun 3, 2020
0639936
fixes cypress tests
MadameSheema Jun 3, 2020
d2f4d33
Merge branch 'security-navigation' of https://github.com/XavierM/kiba…
MadameSheema Jun 3, 2020
af134eb
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
4fa7fbf
Merge branch 'security-navigation' of github.com:XavierM/kibana into …
XavierM Jun 3, 2020
7a676cf
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
8d4203e
fix api integration test
XavierM Jun 3, 2020
774e2e6
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
2586899
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
c7d7ee4
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
77307f6
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
7121d65
fix new translation
XavierM Jun 3, 2020
955a9ce
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 3, 2020
f86c062
fix unit test
XavierM Jun 4, 2020
b332c7b
update translation i18n
XavierM Jun 4, 2020
a982675
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 4, 2020
3017b1e
update translation i18n II
XavierM Jun 4, 2020
813e216
Merge branch 'master' of github.com:elastic/kibana into security-navi…
XavierM Jun 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 5 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -582,11 +582,11 @@ module.exports = {
},

/**
* SIEM overrides
* Security Solution overrides
*/
{
// front end typescript and javascript files only
files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
files: ['x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}'],
rules: {
'import/no-nodejs-modules': 'error',
'no-restricted-imports': [
Expand All @@ -600,7 +600,7 @@ module.exports = {
},
{
// typescript only for front and back end
files: ['x-pack/{,legacy/}plugins/siem/**/*.{ts,tsx}'],
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{ts,tsx}'],
rules: {
// This will be turned on after bug fixes are complete
// '@typescript-eslint/explicit-member-accessibility': 'warn',
Expand Down Expand Up @@ -635,7 +635,7 @@ module.exports = {
// {
// // will introduced after the other warns are fixed
// // typescript and javascript for front end react performance
// files: ['x-pack/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
// files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,ts,tsx}'],
// plugins: ['react-perf'],
// rules: {
// // 'react-perf/jsx-no-new-object-as-prop': 'error',
Expand All @@ -646,7 +646,7 @@ module.exports = {
// },
{
// typescript and javascript for front and back end
files: ['x-pack/{,legacy/}plugins/siem/**/*.{js,ts,tsx}'],
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,ts,tsx}'],
plugins: ['eslint-plugin-node', 'react'],
env: {
mocha: true,
Expand Down
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem

# SIEM
/x-pack/plugins/siem/ @elastic/siem @elastic/endpoint-app-team
# Security Solution
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
/x-pack/test/api_integration/apis/siem @elastic/siem @elastic/endpoint-app-team
/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
/x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team

# Security Intelligence And Analytics
/x-pack/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
'xpack-siemCypress': { processNumber ->
whenChanged(['x-pack/plugins/siem/', 'x-pack/test/siem_cypress/']) {
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
'xpack-securitySolutionCypress': { processNumber ->
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
}
},

Expand Down
2 changes: 1 addition & 1 deletion src/cli/cluster/cluster_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ export class ClusterManager {
...pluginInternalDirsIgnore,
fromRoot('src/legacy/server/sass/__tmp__'),
fromRoot('x-pack/legacy/plugins/reporting/.chromium'),
fromRoot('x-pack/plugins/siem/cypress'),
fromRoot('x-pack/plugins/security_solution/cypress'),
fromRoot('x-pack/plugins/apm/e2e'),
fromRoot('x-pack/plugins/apm/scripts'),
fromRoot('x-pack/plugins/canvas/canvas_plugin_src'), // prevents server from restarting twice for Canvas plugin changes,
Expand Down
2 changes: 1 addition & 1 deletion src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ export const storybookAliases = {
drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js',
embeddable: 'src/plugins/embeddable/scripts/storybook.js',
infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
siem: 'x-pack/plugins/siem/scripts/storybook.js',
security_solution: 'x-pack/plugins/security_solution/scripts/storybook.js',
};
4 changes: 2 additions & 2 deletions src/dev/typescript/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export const PROJECTS = [
new Project(resolve(REPO_ROOT, 'test/tsconfig.json'), { name: 'kibana/test' }),
new Project(resolve(REPO_ROOT, 'x-pack/tsconfig.json')),
new Project(resolve(REPO_ROOT, 'x-pack/test/tsconfig.json'), { name: 'x-pack/test' }),
new Project(resolve(REPO_ROOT, 'x-pack/plugins/siem/cypress/tsconfig.json'), {
name: 'siem/cypress',
new Project(resolve(REPO_ROOT, 'x-pack/plugins/security_solution/cypress/tsconfig.json'), {
name: 'security_solution/cypress',
}),
new Project(resolve(REPO_ROOT, 'x-pack/plugins/apm/e2e/tsconfig.json'), {
name: 'apm/cypress',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const names: Record<string, string> = {
search: i18n.translate('advancedSettings.categoryNames.searchLabel', {
defaultMessage: 'Search',
}),
siem: i18n.translate('advancedSettings.categoryNames.siemLabel', {
defaultMessage: 'SIEM',
securitySolution: i18n.translate('advancedSettings.categoryNames.securitySolutionLabel', {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not certain you will want to change the securitySolution category key here, since x-pack/plugins/security_solution/server/ui_settings.ts is still using siem as the category name when registering settings, and I believe that's how we find the right category here.

It might be safer to leave the key as siem since it isn't surfaced in the UI, and just keep the new defaultMessage. (Or change all of the uiSettings you register to use the new category)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I will prefer to change it everywhere and avoid a mismatch of stuff

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lukeelmers Thank you so much for finding it!!!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After talking with some good folks, We will need to create a follow up to migrate our siem settings to securitySolution

defaultMessage: 'Security solution',
}),
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const PARAM_TYPES = {

const TUTORIAL_CATEGORY = {
LOGGING: 'logging',
SIEM: 'siem',
SECURITY_SOLUTION: 'security solution',
METRICS: 'metrics',
OTHER: 'other',
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ cp -R "$installDir" "$destDir"

export KIBANA_INSTALL_DIR="$destDir"

echo " -> Running SIEM cypress tests"
echo " -> Running security solution cypress tests"
cd "$XPACK_DIR"

checks-reporter-with-killswitch "SIEM Cypress Tests" \
checks-reporter-with-killswitch "Security solution Cypress Tests" \
node scripts/functional_tests \
--debug --bail \
--kibana-install-dir "$KIBANA_INSTALL_DIR" \
--config test/siem_cypress/config.ts
--config test/security_solution_cypress/config.ts

echo ""
echo ""
2 changes: 1 addition & 1 deletion test/scripts/jenkins_xpack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [[ -z "$CODE_COVERAGE" ]] ; then

echo " -> Running SIEM cyclic dependency test"
cd "$XPACK_DIR"
checks-reporter-with-killswitch "X-Pack SIEM cyclic dependency test" node plugins/siem/scripts/check_circular_deps
checks-reporter-with-killswitch "X-Pack SIEM cyclic dependency test" node plugins/security_solution/scripts/check_circular_deps
echo ""
echo ""

Expand Down
2 changes: 1 addition & 1 deletion x-pack/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
/.kibana-plugin-helpers.dev.*
!/legacy/plugins/infra/**/target
.cache
!/legacy/plugins/siem/**/target
!/legacy/plugins/security_solution/**/target
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"xpack.searchProfiler": "plugins/searchprofiler",
"xpack.security": ["legacy/plugins/security", "plugins/security"],
"xpack.server": "legacy/server",
"xpack.siem": "plugins/siem",
"xpack.securitySolution": "plugins/security_solution",
"xpack.snapshotRestore": "plugins/snapshot_restore",
"xpack.spaces": ["legacy/plugins/spaces", "plugins/spaces"],
"xpack.taskManager": "legacy/plugins/task_manager",
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/lists/common/siem_common_deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* you may not use this file except in compliance with the Elastic License.
*/

export { exactCheck } from '../../siem/common/exact_check';
export { getPaths, foldLeftRight } from '../../siem/common/test_utils';
export { exactCheck } from '../../security_solution/common/exact_check';
export { getPaths, foldLeftRight } from '../../security_solution/common/test_utils';
2 changes: 1 addition & 1 deletion x-pack/plugins/lists/server/siem_server_deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ export {
getIndexExists,
buildRouteValidation,
validate,
} from '../../siem/server';
} from '../../security_solution/server';
6 changes: 6 additions & 0 deletions x-pack/plugins/security_solution/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Auto-collapse generated files in GitHub
# https://help.github.com/en/articles/customizing-how-changed-files-appear-on-github
x-pack/plugins/security_solution/server/graphql/types.ts linguist-generated=true
x-pack/plugins/security_solution/public/graphql/types.ts linguist-generated=true
x-pack/plugins/security_solution/public/graphql/introspection.json linguist-generated=true

Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
* you may not use this file except in compliance with the Elastic License.
*/

export const APP_ID = 'siem';
export const APP_NAME = 'SIEM';
export const APP_ID = 'securitySolution';
export const APP_NAME = 'Security';
export const APP_ICON = 'securityAnalyticsApp';
export const APP_PATH = `/app/${APP_ID}`;
export const APP_PATH = `/app/security`;
export const DEFAULT_BYTES_FORMAT = 'format:bytes:defaultPattern';
export const DEFAULT_DATE_FORMAT = 'dateFormat';
export const DEFAULT_DATE_FORMAT_TZ = 'dateFormat:tz';
export const DEFAULT_DARK_MODE = 'theme:darkMode';
export const DEFAULT_INDEX_KEY = 'siem:defaultIndex';
export const DEFAULT_INDEX_KEY = 'securitySolution:defaultIndex';
export const DEFAULT_NUMBER_FORMAT = 'format:number:defaultPattern';
export const DEFAULT_TIME_RANGE = 'timepicker:timeDefaults';
export const DEFAULT_REFRESH_RATE_INTERVAL = 'timepicker:refreshIntervalDefaults';
export const DEFAULT_SIEM_TIME_RANGE = 'siem:timeDefaults';
export const DEFAULT_SIEM_REFRESH_INTERVAL = 'siem:refreshIntervalDefaults';
export const DEFAULT_APP_TIME_RANGE = 'securitySolution:timeDefaults';
export const DEFAULT_APP_REFRESH_INTERVAL = 'securitySolution:refreshIntervalDefaults';
export const DEFAULT_SIGNALS_INDEX = '.siem-signals';
export const DEFAULT_MAX_SIGNALS = 100;
export const DEFAULT_SEARCH_AFTER_PAGE_SIZE = 100;
export const DEFAULT_ANOMALY_SCORE = 'siem:defaultAnomalyScore';
export const DEFAULT_ANOMALY_SCORE = 'securitySolution:defaultAnomalyScore';
export const DEFAULT_MAX_TABLE_QUERY_SIZE = 10000;
export const DEFAULT_SCALE_DATE_FORMAT = 'dateFormat:scaled';
export const DEFAULT_FROM = 'now-24h';
Expand All @@ -42,16 +42,16 @@ export const DEFAULT_INDEX_PATTERN = [
];

/** This Kibana Advanced Setting enables the `Security news` feed widget */
export const ENABLE_NEWS_FEED_SETTING = 'siem:enableNewsFeed';
export const ENABLE_NEWS_FEED_SETTING = 'securitySolution:enableNewsFeed';

/** This Kibana Advanced Setting specifies the URL of the News feed widget */
export const NEWS_FEED_URL_SETTING = 'siem:newsFeedUrl';
export const NEWS_FEED_URL_SETTING = 'securitySolution:newsFeedUrl';

/** The default value for News feed widget */
export const NEWS_FEED_URL_SETTING_DEFAULT = 'https://feeds.elastic.co/security-solution';

/** This Kibana Advanced Setting specifies the URLs of `IP Reputation Links`*/
export const IP_REPUTATION_LINKS_SETTING = 'siem:ipReputationLinks';
export const IP_REPUTATION_LINKS_SETTING = 'securitySolution:ipReputationLinks';

/** The default value for `IP Reputation Links` */
export const IP_REPUTATION_LINKS_SETTING_DEFAULT = `[
Expand All @@ -62,12 +62,12 @@ export const IP_REPUTATION_LINKS_SETTING_DEFAULT = `[
/**
* Id for the signals alerting type
*/
export const SIGNALS_ID = `${APP_ID}.signals`;
export const SIGNALS_ID = `siem.signals`;

/**
* Id for the notifications alerting type
*/
export const NOTIFICATIONS_ID = `${APP_ID}.notifications`;
export const NOTIFICATIONS_ID = `siem.notifications`;

/**
* Special internal structure for tags for signals. This is used
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const alertingIndexGetQuerySchema = schema.object(
try {
decode(value);
} catch (err) {
return i18n.translate('xpack.siem.endpoint.alerts.errors.bad_rison', {
return i18n.translate('xpack.securitySolution.endpoint.alerts.errors.bad_rison', {
defaultMessage: 'must be a valid rison-encoded string',
});
}
Expand All @@ -62,7 +62,7 @@ export const alertingIndexGetQuerySchema = schema.object(
try {
decode(value);
} catch (err) {
return i18n.translate('xpack.siem.endpoint.alerts.errors.bad_rison', {
return i18n.translate('xpack.securitySolution.endpoint.alerts.errors.bad_rison', {
defaultMessage: 'must be a valid rison-encoded string',
});
}
Expand All @@ -77,7 +77,7 @@ export const alertingIndexGetQuerySchema = schema.object(
try {
decode(value);
} catch (err) {
return i18n.translate('xpack.siem.endpoint.alerts.errors.bad_rison', {
return i18n.translate('xpack.securitySolution.endpoint.alerts.errors.bad_rison', {
defaultMessage: 'must be a valid rison-encoded string',
});
}
Expand All @@ -89,23 +89,23 @@ export const alertingIndexGetQuerySchema = schema.object(
validate(value) {
if (value.after !== undefined && value.page_index !== undefined) {
return i18n.translate(
'xpack.siem.endpoint.alerts.errors.page_index_cannot_be_used_with_after',
'xpack.securitySolution.endpoint.alerts.errors.page_index_cannot_be_used_with_after',
{
defaultMessage: '[page_index] cannot be used with [after]',
}
);
}
if (value.before !== undefined && value.page_index !== undefined) {
return i18n.translate(
'xpack.siem.endpoint.alerts.errors.page_index_cannot_be_used_with_before',
'xpack.securitySolution.endpoint.alerts.errors.page_index_cannot_be_used_with_before',
{
defaultMessage: '[page_index] cannot be used with [before]',
}
);
}
if (value.before !== undefined && value.after !== undefined) {
return i18n.translate(
'xpack.siem.endpoint.alerts.errors.before_cannot_be_used_with_after',
'xpack.securitySolution.endpoint.alerts.errors.before_cannot_be_used_with_after',
{
defaultMessage: '[before] cannot be used with [after]',
}
Expand Down
Loading