Skip to content

Commit 4623b0c

Browse files
authored
Merge branch 'main' into fix-kb-migration-api-test
2 parents a0eeb11 + 4a5a6b5 commit 4623b0c

File tree

239 files changed

+3189
-41153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+3189
-41153
lines changed

.buildkite/scripts/build_kibana.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ BUILD_ARGS=("--with-test-plugins" "--with-example-plugins")
1212
is_pr_with_label "ci:build-all-platforms" && BUILD_ARGS+=("--all-platforms")
1313
is_pr_with_label "ci:build-docker-cross-compile" && BUILD_ARGS+=("--docker-cross-compile")
1414
is_pr_with_label "ci:build-os-packages" || BUILD_ARGS+=("--skip-os-packages")
15-
is_pr_with_label "ci:build-canvas-shareable-runtime" || BUILD_ARGS+=("--skip-canvas-shareable-runtime")
1615
is_pr_with_label "ci:build-docker-contexts" || BUILD_ARGS+=("--skip-docker-contexts")
1716
is_pr_with_label "ci:build-cdn-assets" || BUILD_ARGS+=("--skip-cdn-assets")
1817

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ snapshots.js
2222
# plugin overrides
2323
/src/platform/plugins/shared/data/common/es_query/kuery/ast/_generated_/**
2424
/x-pack/platform/plugins/private/canvas/canvas_plugin
25-
/x-pack/platform/plugins/private/canvas/shareable_runtime/build
2625
/x-pack/platform/plugins/private/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
2726
/x-pack/platform/plugins/private/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
2827
/x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/public/assets/**

.github/CODEOWNERS

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ src/platform/packages/shared/kbn-interpreter @elastic/kibana-visualizations
511511
src/platform/packages/shared/kbn-io-ts-utils @elastic/obs-knowledge-team
512512
src/platform/packages/shared/kbn-jest-benchmarks @elastic/obs-ui-devex-team
513513
src/platform/packages/shared/kbn-lazy-object @elastic/kibana-operations
514-
src/platform/packages/shared/kbn-lens-embeddable-utils @elastic/obs-ux-infra_services-team @elastic/kibana-visualizations
514+
src/platform/packages/shared/kbn-lens-embeddable-utils @elastic/kibana-visualizations
515515
src/platform/packages/shared/kbn-licensing-types @elastic/kibana-core
516516
src/platform/packages/shared/kbn-lock-manager @elastic/obs-ai-assistant
517517
src/platform/packages/shared/kbn-logging @elastic/kibana-core
@@ -1148,14 +1148,14 @@ x-pack/solutions/security/packages/ai-security-labs-content @elastic/security-ge
11481148
x-pack/solutions/security/packages/connectors @elastic/security-threat-hunting-investigations
11491149
x-pack/solutions/security/packages/data-stream-adapter @elastic/security-threat-hunting
11501150
x-pack/solutions/security/packages/data-table @elastic/security-threat-hunting-investigations
1151-
x-pack/solutions/security/packages/distribution-bar @elastic/kibana-cloud-security-posture
1151+
x-pack/solutions/security/packages/distribution-bar @elastic/contextual-security-apps
11521152
x-pack/solutions/security/packages/ecs-data-quality-dashboard @elastic/security-threat-hunting-investigations
11531153
x-pack/solutions/security/packages/expandable-flyout @elastic/security-threat-hunting-investigations
11541154
x-pack/solutions/security/packages/features @elastic/security-threat-hunting-investigations
11551155
x-pack/solutions/security/packages/index-adapter @elastic/security-threat-hunting
1156-
x-pack/solutions/security/packages/kbn-cloud-security-posture/common @elastic/kibana-cloud-security-posture
1157-
x-pack/solutions/security/packages/kbn-cloud-security-posture/graph @elastic/kibana-cloud-security-posture
1158-
x-pack/solutions/security/packages/kbn-cloud-security-posture/public @elastic/kibana-cloud-security-posture
1156+
x-pack/solutions/security/packages/kbn-cloud-security-posture/common @elastic/contextual-security-apps
1157+
x-pack/solutions/security/packages/kbn-cloud-security-posture/graph @elastic/contextual-security-apps
1158+
x-pack/solutions/security/packages/kbn-cloud-security-posture/public @elastic/contextual-security-apps
11591159
x-pack/solutions/security/packages/kbn-scout-security @elastic/appex-qa
11601160
x-pack/solutions/security/packages/kbn-securitysolution-autocomplete @elastic/security-detection-engine
11611161
x-pack/solutions/security/packages/kbn-securitysolution-endpoint-exceptions-common @elastic/security-detection-engine
@@ -1174,19 +1174,19 @@ x-pack/solutions/security/packages/kbn-securitysolution-utils @elastic/security-
11741174
x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-investigations
11751175
x-pack/solutions/security/packages/security-ai-prompts @elastic/security-generative-ai
11761176
x-pack/solutions/security/packages/side-nav @elastic/security-threat-hunting-investigations
1177-
x-pack/solutions/security/packages/siem-readiness @elastic/kibana-cloud-security-posture
1177+
x-pack/solutions/security/packages/siem-readiness @elastic/contextual-security-apps
11781178
x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-investigations
11791179
x-pack/solutions/security/packages/test-api-clients @elastic/security-detection-rule-management
11801180
x-pack/solutions/security/packages/upselling @elastic/security-threat-hunting-investigations
1181-
x-pack/solutions/security/plugins/cloud_security_posture @elastic/kibana-cloud-security-posture
1181+
x-pack/solutions/security/plugins/cloud_security_posture @elastic/contextual-security-apps
11821182
x-pack/solutions/security/plugins/ecs_data_quality_dashboard @elastic/security-threat-hunting-investigations
11831183
x-pack/solutions/security/plugins/elastic_assistant @elastic/security-generative-ai
11841184
x-pack/solutions/security/plugins/elastic_assistant_shared_state @elastic/security-generative-ai
11851185
x-pack/solutions/security/plugins/lists @elastic/security-detection-engine
11861186
x-pack/solutions/security/plugins/security_solution @elastic/security-solution
11871187
x-pack/solutions/security/plugins/security_solution_ess @elastic/security-solution
11881188
x-pack/solutions/security/plugins/security_solution_serverless @elastic/security-solution
1189-
x-pack/solutions/security/plugins/session_view @elastic/kibana-cloud-security-posture
1189+
x-pack/solutions/security/plugins/session_view @elastic/contextual-security-apps
11901190
x-pack/solutions/security/test
11911191
x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/security-solution
11921192
####
@@ -2399,7 +2399,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
23992399
/x-pack/solutions/security/test/serverless/ @elastic/security-solution
24002400
/x-pack/solutions/security/test/serverless/functional/configs/config.ts @elastic/security-solution @elastic/appex-qa
24012401
/x-pack/solutions/security/test/serverless/functional/configs/config.mki_only.ts @elastic/security-solution @elastic/appex-qa
2402-
/x-pack/solutions/security/test/serverless/functional/configs/index.mki_only.ts @elastic/security-solution @elastic/appex-qa @elastic/kibana-cloud-security-posture
2402+
/x-pack/solutions/security/test/serverless/functional/configs/index.mki_only.ts @elastic/security-solution @elastic/appex-qa @elastic/contextual-security-apps
24032403
/x-pack/solutions/security/test/serverless/functional/configs/config.feature_flags.ts @elastic/security-solution
24042404

24052405
#CC# /x-pack/solutions/security/plugins/security_solution/ @elastic/security-solution
@@ -2479,8 +2479,8 @@ x-pack/solutions/security/test/security_solution_api_integration/test_suites/sou
24792479

24802480
## Security Solution sub teams - Cloud Security Posture
24812481

2482-
x-pack/solutions/security/plugins/security_solution/public/asset_inventory @elastic/kibana-cloud-security-posture
2483-
x-pack/solutions/security/plugins/security_solution/public/siem_readiness @elastic/kibana-cloud-security-posture
2482+
x-pack/solutions/security/plugins/security_solution/public/asset_inventory @elastic/contextual-security-apps
2483+
x-pack/solutions/security/plugins/security_solution/public/siem_readiness @elastic/contextual-security-apps
24842484

24852485
## Security Solution sub teams - Security Entity Store
24862486
x-pack/platform/packages/shared/kbn-entities-schema/src/schema/v1 @elastic/core-analysis
@@ -2853,40 +2853,41 @@ x-pack/platform/test/automatic_import_api_integration @elastic/integration-exper
28532853
# Cloud Security Posture team
28542854

28552855
## Packages
2856-
x-pack/packages/kbn-cloud-security-posture @elastic/kibana-cloud-security-posture
2856+
x-pack/packages/kbn-cloud-security-posture @elastic/contextual-security-apps
28572857
## Plugins
2858-
x-pack/plugins/cloud_security_posture @elastic/kibana-cloud-security-posture
2859-
x-pack/plugins/kubernetes_security @elastic/kibana-cloud-security-posture
2858+
x-pack/plugins/cloud_security_posture @elastic/contextual-security-apps
2859+
x-pack/plugins/kubernetes_security @elastic/contextual-security-apps
28602860
## Security Solution sub teams
2861-
x-pack/solutions/security/plugins/security_solution/public/common/components/sessions_viewer @elastic/kibana-cloud-security-posture
2862-
x-pack/solutions/security/plugins/security_solution/public/cloud_security_posture @elastic/kibana-cloud-security-posture
2863-
x-pack/solutions/security/plugins/security_solution/public/kubernetes @elastic/kibana-cloud-security-posture
2864-
x-pack/solutions/security/plugins/security_solution/server/lib/asset_inventory @elastic/kibana-cloud-security-posture
2865-
x-pack/solutions/security/plugins/security_solution/server/lib/siem_readiness @elastic/kibana-cloud-security-posture
2866-
x-pack/solutions/security/plugins/security_solution/public/flyout/entity_details/generic_right @elastic/kibana-cloud-security-posture
2867-
/x-pack/solutions/security/plugins/security_solution/public/flyout/csp_details @elastic/kibana-cloud-security-posture
2861+
x-pack/solutions/security/plugins/security_solution/public/common/components/sessions_viewer @elastic/contextual-security-apps
2862+
x-pack/solutions/security/plugins/security_solution/public/cloud_security_posture @elastic/contextual-security-apps
2863+
x-pack/solutions/security/plugins/security_solution/public/kubernetes @elastic/contextual-security-apps
2864+
x-pack/solutions/security/plugins/security_solution/server/lib/asset_inventory @elastic/contextual-security-apps
2865+
x-pack/solutions/security/plugins/security_solution/server/lib/siem_readiness @elastic/contextual-security-apps
2866+
x-pack/solutions/security/plugins/security_solution/public/flyout/entity_details/generic_right @elastic/contextual-security-apps
2867+
/x-pack/solutions/security/plugins/security_solution/public/flyout/csp_details @elastic/contextual-security-apps
28682868

28692869
## Fleet plugin (co-owned with Fleet team)
2870-
x-pack/platform/plugins/shared/fleet/public/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
2871-
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/cloud_security_posture @elastic/fleet @elastic/kibana-cloud-security-posture
2872-
x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/screens/detail/components/cloud_posture_third_party_support_callout.* @elastic/fleet @elastic/kibana-cloud-security-posture
2870+
x-pack/platform/plugins/shared/fleet/public/components/cloud_security_posture @elastic/fleet @elastic/contextual-security-apps
2871+
x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/cloud_security_posture @elastic/fleet @elastic/contextual-security-apps
2872+
x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/screens/detail/components/cloud_posture_third_party_support_callout.* @elastic/fleet @elastic/contextual-security-apps
28732873
## SessionView tests
2874-
x-pack/solutions/security/test/fixtures/es_archives/session_view @elastic/kibana-cloud-security-posture
2875-
x-pack/solutions/security/test/session_view @elastic/kibana-cloud-security-posture # Assigned per https://github.com/elastic/kibana/blob/main/api_docs/session_view.mdx#L18
2874+
x-pack/solutions/security/test/fixtures/es_archives/session_view @elastic/contextual-security-apps
2875+
x-pack/solutions/security/test/session_view @elastic/contextual-security-apps # Assigned per https://github.com/elastic/kibana/blob/main/api_docs/session_view.mdx#L18
28762876
## CSP tests
2877-
x-pack/solutions/security/test/api_integration/apis/cloud_security_posture/ @elastic/kibana-cloud-security-posture
2878-
x-pack/solutions/security/test/cloud_security_posture_functional/ @elastic/kibana-cloud-security-posture
2879-
x-pack/solutions/security/test/cloud_security_posture_api/ @elastic/kibana-cloud-security-posture
2877+
x-pack/solutions/security/test/api_integration/apis/cloud_security_posture/ @elastic/contextual-security-apps
2878+
x-pack/solutions/security/test/cloud_security_posture_functional/ @elastic/contextual-security-apps
2879+
x-pack/solutions/security/test/cloud_security_posture_api/ @elastic/contextual-security-apps
28802880
## CSP Serverless tests
2881-
x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.* @elastic/kibana-cloud-security-posture
2882-
x-pack/solutions/security/test/serverless/functional/test_suites/ftr/cloud_security_posture/ @elastic/kibana-cloud-security-posture
2883-
x-pack/solutions/security/test/serverless/api_integration/test_suites/cloud_security_posture/ @elastic/kibana-cloud-security-posture
2881+
x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.* @elastic/contextual-security-apps
2882+
x-pack/solutions/security/test/serverless/functional/test_suites/ftr/cloud_security_posture/ @elastic/contextual-security-apps
2883+
x-pack/solutions/security/test/serverless/api_integration/test_suites/cloud_security_posture/ @elastic/contextual-security-apps
28842884
## CSP e2e tests
2885-
x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/cloud_security_posture/misconfiguration_contextual_flyout.cy.ts @elastic/kibana-cloud-security-posture
2886-
x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/cloud_security_posture/vulnerabilities_contextual_flyout.cy.ts @elastic/kibana-cloud-security-posture
2887-
x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/asset_inventory @elastic/kibana-cloud-security-posture
2888-
x-pack/solutions/security/test/security_solution_cypress/cypress/screens/asset_inventory @elastic/kibana-cloud-security-posture
2889-
x-pack/solutions/security/test/security_solution_cypress/cypress/tasks/asset_inventory @elastic/kibana-cloud-security-posture
2885+
2886+
x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/cloud_security_posture/misconfiguration_contextual_flyout.cy.ts @elastic/contextual-security-apps
2887+
x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/cloud_security_posture/vulnerabilities_contextual_flyout.cy.ts @elastic/contextual-security-apps
2888+
x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/asset_inventory @elastic/contextual-security-apps
2889+
x-pack/solutions/security/test/security_solution_cypress/cypress/screens/asset_inventory @elastic/contextual-security-apps
2890+
x-pack/solutions/security/test/security_solution_cypress/cypress/tasks/asset_inventory @elastic/contextual-security-apps
28902891

28912892
# Security Service Integrations
28922893
x-pack/solutions/security/plugins/security_solution/common/security_integrations @elastic/security-service-integrations

.stylelintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss
21
build
32
target
43
bazel-*

STYLEGUIDE.mdx

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -624,38 +624,11 @@ by your code until the circular dependencies on these have been solved.
624624
625625
## SASS files
626626
627-
When writing a new component, create a sibling SASS file of the same name and import
628-
directly into the **top** of the JS/TS component file.
629-
Doing so ensures the styles are never separated or lost on import and allows
630-
for better modularization (smaller individual plugin asset footprint).
627+
**⚠️ DEPRECATED**: Do not add new SCSS files to your work. SCSS is being phased out in favor of CSS-in-JS solutions.
631628
632-
All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass)
633-
& Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/core/public/styles/core_app/_globals_v8light.scss).
629+
For existing SCSS files, continue to maintain them as needed, but all new styling should use alternative approaches such as CSS-in-JS with Emotion or other modern styling solutions.
634630
635-
While the styles for this component will only be loaded if the component exists on the page,
636-
the styles **will** be global and so it is recommended to use a three letter prefix on your
637-
classes to ensure proper scope.
638-
639-
**Example:**
640-
641-
```tsx
642-
// component.tsx
643-
644-
import './component.scss';
645-
// All other imports below the SASS import
646-
647-
export const Component = () => {
648-
return <div className="plgComponent" />;
649-
};
650-
```
651-
652-
```scss
653-
// component.scss
654-
655-
.plgComponent { ... }
656-
```
657-
658-
Do not use the underscore `_` SASS file naming pattern when importing directly into a javascript file.
631+
For more information about the migration away from SCSS, refer to the [EUI CSS-in-JS migration tracking issue](https://github.com/elastic/eui/issues/3912).
659632
660633
## React
661634

dev_docs/tutorials/ci.mdx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ Some Cypress test suites are only run when code changes are made in certain file
3939

4040
Build Windows, macOS, and Linux archives.
4141

42-
#### `ci:build-canvas-shareable-runtime`
43-
44-
Build the Canvas shareable runtime and include it in the distribution.
45-
4642
#### `ci:build-cdn-assets`
4743

4844
Build an archive that can be used to serve Kibana's static assets.

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,6 @@
18971897
"eslint-traverse": "^1.0.0",
18981898
"exit-hook": "2.2.0",
18991899
"expect": "^29.7.0",
1900-
"expose-loader": "^5.0.0",
19011900
"express": "^4.21.2",
19021901
"fast-glob": "^3.3.2",
19031902
"fetch-mock": "^10.1.0",
@@ -1912,7 +1911,6 @@
19121911
"gulp-terser": "^2.1.0",
19131912
"has-ansi": "^3.0.0",
19141913
"hdr-histogram-js": "^3.0.1",
1915-
"html-loader": "^5.1.0",
19161914
"http-proxy": "^1.18.1",
19171915
"http2-proxy": "^5.0.53",
19181916
"http2-wrapper": "^2.2.1",
@@ -1963,7 +1961,6 @@
19631961
"pngjs": "^7.0.0",
19641962
"postcss": "^8.5.6",
19651963
"postcss-loader": "^8.2.0",
1966-
"postcss-prefix-selector": "^1.16.0",
19671964
"postcss-scss": "^4.0.9",
19681965
"prettier": "^2.8.8",
19691966
"proxy": "^2.1.1",
@@ -1984,7 +1981,6 @@
19841981
"sort-package-json": "^3.2.1",
19851982
"source-map": "^0.7.6",
19861983
"storybook": "^8.6.3",
1987-
"string-replace-loader": "^3.1.0",
19881984
"style-loader": "^4.0.0",
19891985
"stylelint": "^14.16.1",
19901986
"stylelint-scss": "^4.3.0",

packages/kbn-cli-dev-mode/src/watcher.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const packageMatcher = makeMatcher([
2020
'**/*',
2121
'!**/.*',
2222
'!x-pack/platform/plugins/shared/screenshotting/chromium/**',
23-
'!x-pack/platform/plugins/private/canvas/shareable_runtime/**',
2423
]);
2524

2625
/**

packages/kbn-repo-source-classifier/src/repo_source_classifier.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ export class RepoSourceClassifier {
121121
return 'common package';
122122
}
123123

124-
if (root === 'shareable_runtime') {
125-
return 'non-package';
126-
}
127-
128124
if (root === 'tasks') {
129125
return 'tests or mocks';
130126
}

renovate.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@
858858
"minimumReleaseAge": "14 days"
859859
},
860860
{
861-
"groupName": "@elastic/kibana-cloud-security-posture dependencies",
861+
"groupName": "@elastic/contextual-security-apps dependencies",
862862
"matchDepNames": [
863863
"@mswjs/http-middleware",
864864
"@types/byte-size",
@@ -867,7 +867,7 @@
867867
"xterm"
868868
],
869869
"reviewers": [
870-
"team:kibana-cloud-security-posture"
870+
"team:contextual-security-apps"
871871
],
872872
"matchBaseBranches": [
873873
"main"
@@ -2768,12 +2768,8 @@
27682768
{
27692769
"groupName": "kibana-presentation misc canvas dependencies",
27702770
"matchDepNames": [
2771-
"expose-loader",
2772-
"html-loader",
27732771
"object-path-immutable",
2774-
"postcss-prefix-selector",
2775-
"safe-squel",
2776-
"string-replace-loader"
2772+
"safe-squel"
27772773
],
27782774
"reviewers": [
27792775
"team:kibana-presentation"
@@ -3807,7 +3803,7 @@
38073803
],
38083804
"reviewers": [
38093805
"team:response-ops",
3810-
"team:kibana-cloud-security-posture",
3806+
"team:contextual-security-apps",
38113807
"team:security-asset-management",
38123808
"team:fleet",
38133809
"team:awp-platform",
@@ -4619,7 +4615,7 @@
46194615
"@xyflow/react"
46204616
],
46214617
"reviewers": [
4622-
"team:kibana-cloud-security-posture"
4618+
"team:contextual-security-apps"
46234619
],
46244620
"matchBaseBranches": [
46254621
"main"
@@ -4638,7 +4634,7 @@
46384634
"@dagrejs/dagre"
46394635
],
46404636
"reviewers": [
4641-
"team:kibana-cloud-security-posture"
4637+
"team:contextual-security-apps"
46424638
],
46434639
"matchBaseBranches": [
46444640
"main"

0 commit comments

Comments
 (0)