Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ const SKIPPABLE_PR_MATCHERS = prConfig.skip_ci_on_only_changed!.map((r) => new R
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/platform\/plugins\/shared\/timelines/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/server\/connector_types\/openai/,
Expand Down Expand Up @@ -365,7 +365,7 @@ const SKIPPABLE_PR_MATCHERS = prConfig.skip_ci_on_only_changed!.map((r) => new R
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
/^x-pack\/platform\/plugins\/shared\/timelines/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui/,
/^x-pack\/platform\/plugins\/shared\/usage_collection\/public/,
/^x-pack\/test\/functional\/es_archives\/security_solution/,
Expand Down Expand Up @@ -428,7 +428,7 @@ const SKIPPABLE_PR_MATCHERS = prConfig.skip_ci_on_only_changed!.map((r) => new R
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
/^x-pack\/platform\/plugins\/shared\/timelines/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui/,
/^x-pack\/platform\/plugins\/shared\/usage_collection\/public/,
/^x-pack\/test\/functional\/es_archives\/security_solution/,
Expand Down
17 changes: 7 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1257,8 +1257,8 @@ module.exports = {
'x-pack/solutions/security/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/common/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/timelines/public/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/timelines/common/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/timelines/public/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/timelines/common/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/cases/public/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/cases/common/**/*.{js,mjs,ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{js,mjs,ts,tsx}',
Expand Down Expand Up @@ -1299,7 +1299,7 @@ module.exports = {
'x-pack/solutions/security/plugins/security_solution/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{ts,tsx}',
'x-pack/platform/plugins/shared/timelines/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{ts,tsx}',
'x-pack/platform/plugins/shared/cases/**/*.{ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{js,mjs,ts,tsx}',
],
Expand All @@ -1314,7 +1314,7 @@ module.exports = {
'x-pack/solutions/security/plugins/security_solution/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/platform/plugins/shared/timelines/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{test,mock,test_helper}.{ts,tsx}',
'x-pack/platform/plugins/shared/cases/**/*.{test,mock,test_helper}.{ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{test,mock,test_helper}.{ts,tsx}',
],
Expand All @@ -1335,7 +1335,7 @@ module.exports = {
'x-pack/solutions/security/plugins/security_solution/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{ts,tsx}',
'x-pack/platform/plugins/shared/timelines/**/*.{ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{ts,tsx}',
'x-pack/platform/plugins/shared/cases/**/*.{ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{ts,tsx}',
],
Expand Down Expand Up @@ -1369,7 +1369,7 @@ module.exports = {
'x-pack/solutions/security/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_ess/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/timelines/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/plugins/timelines/**/*.{js,mjs,ts,tsx}',
'x-pack/platform/plugins/shared/cases/**/*.{js,mjs,ts,tsx}',
'x-pack/solutions/security/packages/data-stream-adapter/**/*.{js,mjs,ts,tsx}',
'src/platform/packages/shared/kbn-cell-actions/**/*.{js,mjs,ts,tsx}',
Expand Down Expand Up @@ -2530,10 +2530,7 @@ module.exports = {
// TODO @kibana/operations
'scripts/create_observability_rules.js', // is importing "@kbn/observability-alerting-test-data" (observability/private)
'src/cli_setup/**', // is importing "@kbn/interactive-setup-plugin" (platform/private)
'src/dev/build/tasks/install_chromium.ts', // is importing "@kbn/screenshotting-plugin" (platform/private)

// FIXME PhilippeOberti @kbn/timelines-plugin depends on security-solution-plugin (security/private) (timelines is going to disappear)
'x-pack/platform/plugins/shared/timelines/**',
'src/dev/build/tasks/install_chromium.ts', // is importing "@kbn/screenshotting-plugin" (platform/private)*',

// For now, we keep the exception to let tests depend on anything.
// Ideally, we need to classify the solution specific ones to reduce CI times
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,6 @@ x-pack/platform/plugins/shared/stack_connectors @elastic/response-ops
x-pack/platform/plugins/shared/streams @elastic/obs-onboarding-team @elastic/obs-sig-events-team
x-pack/platform/plugins/shared/streams_app @elastic/obs-onboarding-team @elastic/obs-sig-events-team
x-pack/platform/plugins/shared/task_manager @elastic/response-ops
x-pack/platform/plugins/shared/timelines @elastic/security-threat-hunting-investigations
x-pack/platform/plugins/shared/triggers_actions_ui @elastic/response-ops
x-pack/platform/test
x-pack/platform/test/alerting_api_integration/common/plugins/aad @elastic/response-ops
Expand Down Expand Up @@ -1250,6 +1249,7 @@ x-pack/solutions/security/plugins/security_solution @elastic/security-solution
x-pack/solutions/security/plugins/security_solution_ess @elastic/security-solution
x-pack/solutions/security/plugins/security_solution_serverless @elastic/security-solution
x-pack/solutions/security/plugins/session_view @elastic/contextual-security-apps
x-pack/solutions/security/plugins/timelines @elastic/security-threat-hunting-investigations
x-pack/solutions/security/test
x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/security-solution
x-pack/solutions/security/test/security_solution_api_integration @elastic/security-detection-engine
Expand Down
2 changes: 1 addition & 1 deletion docs/extend/plugin-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ mapped_pages:
| [taskManager](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/task_manager/README.md) | The task manager is a generic system for running background tasks. |
| [taskManagerDependencies](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/private/task_manager_dependencies/README.md) | This plugin is used as a temporary sidecar plugin to enable the task manager plugin access to the encrypted saved objects client and the security plugin start contract as there is a circular dependency if the task manager were to require the encrypted saved objects plugin directly. |
| [telemetryCollectionXpack](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/private/telemetry_collection_xpack/README.md) | Gathers all usage collection, retrieving them from both: OSS and X-Pack plugins. |
| [timelines](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/timelines/README.md) | Timelines is a plugin that provides a grid component with accompanying server side apis to help users identify events of interest and perform root cause analysis within Kibana. |
| [timelines](https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/plugins/timelines/README.md) | Timelines is a plugin that provides a grid component with accompanying server side apis to help users identify events of interest and perform root cause analysis within Kibana. |
| [transform](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/private/transform/README.md) | This plugin provides access to the transforms features provided by Elasticsearch. It follows Kibana's standard plugin architecture, originally the plugin boilerplate code was taken from the snapshot/restore plugin. |
| [translations](translations-plugin.md) | Contains Elastic-supported translations. Owned by the Localizations team. For adding localizations and instrument a ui to support translated content, see https://github.com/elastic/kibana/tree/main/src/platform/packages/shared/kbn-i18n |
| [triggersActionsUi](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/triggers_actions_ui/README.md) | The Kibana alerts and actions UI plugin provides a user interface for managing alerts and actions. As a developer you can reuse and extend built-in alerts and actions UI functionality: |
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@
"@kbn/testing-embedded-lens-plugin": "link:x-pack/examples/testing_embedded_lens",
"@kbn/third-party-lens-navigation-prompt-plugin": "link:x-pack/examples/third_party_lens_navigation_prompt",
"@kbn/third-party-vis-lens-example-plugin": "link:x-pack/examples/third_party_vis_lens_example",
"@kbn/timelines-plugin": "link:x-pack/platform/plugins/shared/timelines",
"@kbn/timelines-plugin": "link:x-pack/solutions/security/plugins/timelines",
"@kbn/timelion-grammar": "link:src/platform/packages/private/kbn-timelion-grammar",
"@kbn/timerange": "link:src/platform/packages/shared/kbn-timerange",
"@kbn/tinymath": "link:src/platform/packages/private/kbn-tinymath",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-babel-preset/styled_components_files.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2316,8 +2316,8 @@
"@kbn/third-party-lens-navigation-prompt-plugin/*": ["x-pack/examples/third_party_lens_navigation_prompt/*"],
"@kbn/third-party-vis-lens-example-plugin": ["x-pack/examples/third_party_vis_lens_example"],
"@kbn/third-party-vis-lens-example-plugin/*": ["x-pack/examples/third_party_vis_lens_example/*"],
"@kbn/timelines-plugin": ["x-pack/platform/plugins/shared/timelines"],
"@kbn/timelines-plugin/*": ["x-pack/platform/plugins/shared/timelines/*"],
"@kbn/timelines-plugin": ["x-pack/solutions/security/plugins/timelines"],
"@kbn/timelines-plugin/*": ["x-pack/solutions/security/plugins/timelines/*"],
"@kbn/timelion-grammar": ["src/platform/packages/private/kbn-timelion-grammar"],
"@kbn/timelion-grammar/*": ["src/platform/packages/private/kbn-timelion-grammar/*"],
"@kbn/timerange": ["src/platform/packages/shared/kbn-timerange"],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
],
"xpack.taskManager": "legacy/platform/plugins/shared/task_manager",
"xpack.threatIntelligence": "solutions/security/plugins/threat_intelligence",
"xpack.timelines": "platform/plugins/shared/timelines",
"xpack.timelines": "solutions/security/plugins/timelines",
"xpack.transform": "platform/plugins/private/transform",
"xpack.triggersActionsUI": "platform/plugins/shared/triggers_actions_ui",
"xpack.upgradeAssistant": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const nonFlattenedFormatParamsFields = ['related_integrations', 'threat_mapping'

/**
* Returns true if the field is related to kibana.alert.rule.parameters.
* This code is similar to x-pack/platform/plugins/shared/timelines/common/utils/field_formatters.ts and once
* This code is similar to x-pack/solutions/security/plugins/timelines/common/utils/field_formatters.ts and once
* the Security Solution and Timelines plugins are merged we should probably share the code.
*/
const isRuleParametersFieldOrSubfield = (
Expand All @@ -33,7 +33,7 @@ const isRuleParametersFieldOrSubfield = (
/**
* Recursive function that processes all the fields from an Alert and returns a flattened object as a Record<string, string[]>.
* This is used in EASE alert summary page, in the getPromptContext when passing data to the assistant.
* The logic is similar to x-pack/platform/plugins/shared/timelines/common/utils/field_formatters.ts but for an Alert type.
* The logic is similar to x-pack/solutions/security/plugins/timelines/common/utils/field_formatters.ts but for an Alert type.
*/
export const flattenAlertType = (
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type { SearchHit } from '../../../../../common/search_strategy';
* This should be generally fine, but given the flattened nature of the top level key, utilities like `get` or `getOr` won't work since the path isn't actually nested
* This utility allows users to not only get simple fields, but if they provide a path like `kibana.alert.parameters.index`, it will return an array of all index values
* for each object in the parameters array. As an added note, this work stemmed from a hope to be able to purely use the fields api in place of the data produced by
* `getDataFromFieldsHits` found in `x-pack/platform/plugins/shared/timelines/common/utils/field_formatters.ts`
* `getDataFromFieldsHits` found in `x-pack/solutions/security/plugins/timelines/common/utils/field_formatters.ts`
*/
const getAllDotIndicesInReverse = (dotField: string): number[] => {
const dotRegx = RegExp('[.]', 'g');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { parseRequest } from './parse_request';
import { buildIndexNameWithNamespace } from '../../../common/endpoint/utils/index_name_utilities';

/**
* EndpointFieldProvider mimics indexField provider from timeline plugin: x-pack/platform/plugins/shared/timelines/server/search_strategy/index_fields/index.ts
* EndpointFieldProvider mimics indexField provider from timeline plugin: x-pack/solutions/security/plugins/timelines/server/search_strategy/index_fields/index.ts
* but it uses ES internalUser instead to avoid adding extra index privileges for users with event filters permissions.
* It is used to retrieve index patterns for event filters form.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
module.exports = {
preset: '@kbn/test',
rootDir: '../../../../..',
roots: ['<rootDir>/x-pack/platform/plugins/shared/timelines'],
roots: ['<rootDir>/x-pack/solutions/security/plugins/timelines'],
coverageDirectory:
'<rootDir>/target/kibana-coverage/jest/x-pack/platform/plugins/shared/timelines',
'<rootDir>/target/kibana-coverage/jest/x-pack/solutions/security/plugins/timelines',
coverageReporters: ['text', 'html'],
collectCoverageFrom: [
'<rootDir>/x-pack/platform/plugins/shared/timelines/{common,public,server}/**/*.{ts,tsx}',
'<rootDir>/x-pack/solutions/security/plugins/timelines/{common,public,server}/**/*.{ts,tsx}',
],
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"owner": [
"@elastic/security-threat-hunting-investigations"
],
"group": "platform",
"visibility": "shared",
"group": "security",
"visibility": "private",
"plugin": {
"id": "timelines",
"browser": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ project:
channel: ''
owner: '@elastic/security-threat-hunting-investigations'
metadata:
sourceRoot: x-pack/platform/plugins/shared/timelines
sourceRoot: x-pack/solutions/security/plugins/timelines
dependsOn:
- '@kbn/core'
- '@kbn/data-plugin'
Expand Down Expand Up @@ -46,8 +46,8 @@ dependsOn:
tags:
- plugin
- prod
- group-platform
- shared
- group-security
- private
- jest-unit-tests
fileGroups:
src:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const configSchema = schema.object({
* For internal use. A list of string values (comma delimited) that will enable experimental
* type of functionality that is not yet released. Valid values for this settings need to
* be defined in:
* `x-pack/platform/plugins/shared/timelines/common/experimental_features.ts`
* `x-pack/solutions/security/plugins/timelines/common/experimental_features.ts`
* under the `allowedExperimentalValues` object
*
* @example
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9174,7 +9174,7 @@
version "0.0.0"
uid ""

"@kbn/timelines-plugin@link:x-pack/platform/plugins/shared/timelines":
"@kbn/timelines-plugin@link:x-pack/solutions/security/plugins/timelines":
version "0.0.0"
uid ""

Expand Down
Loading