Skip to content

Commit df8f886

Browse files
authored
Merge branch 'main' into security/attack-alerts-alignment/POC-attack-promotion
2 parents fc83431 + 7101353 commit df8f886

111 files changed

Lines changed: 1466 additions & 979 deletions

File tree

Some content is hidden

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

.buildkite/scripts/steps/kbn_ui_publish.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,11 @@ if [[ "${DRY_RUN:-}" == "1" ]]; then
9696
fi
9797

9898
report_step "Fetching Artifactory credentials"
99-
# The secret is stored at `kv/ci-shared/serverless/cloud-ui/kbn-ui-artifactory-registry`,
100-
# so that engineering orgs and CIs from kibana and cloud-ui can both access it without
101-
# granting broader vault permissions.
102-
# Secret layout:
99+
# Secret layout at `secret/ci/elastic-kibana/kbn-ui-artifactory`:
103100
# registry - full npm registry URL
104101
# npm_token - auth token
105-
NPM_REGISTRY="$(vault_kv_get kv/ci-shared/serverless/cloud-ui/kbn-ui-artifactory-registry registry_url)"
106-
NPM_TOKEN="$(vault_kv_get kv/ci-shared/serverless/cloud-ui/kbn-ui-artifactory-registry npm_token)"
102+
NPM_REGISTRY="$(vault_get kbn-ui-artifactory registry)"
103+
NPM_TOKEN="$(vault_get kbn-ui-artifactory npm_token)"
107104
if [[ -z "$NPM_REGISTRY" || -z "$NPM_TOKEN" ]]; then
108105
echo "ERROR: Artifactory credentials missing from vault." >&2
109106
exit 1

.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,8 +3002,8 @@ module.exports = {
30023002
'@kbn/*',
30033003
'!@kbn/i18n',
30043004
'!@kbn/i18n-react',
3005-
'!@kbn/core-chrome-layout-constants',
3006-
'!@kbn/core-chrome-layout-utils',
3005+
'!@kbn/ui-chrome-layout-constants',
3006+
'!@kbn/ui-chrome-layout-utils',
30073007
],
30083008
},
30093009
],

.github/CODEOWNERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ src/core/packages/user-storage/server-mocks @elastic/appex-sharedux
360360
src/core/test-helpers/kbn-server @elastic/kibana-core
361361
src/core/test-helpers/model-versions @elastic/kibana-core
362362
src/platform/kbn-ui/chrome-layout @elastic/appex-sharedux
363+
src/platform/kbn-ui/chrome-layout-constants @elastic/appex-sharedux
364+
src/platform/kbn-ui/chrome-layout-utils @elastic/appex-sharedux
363365
src/platform/kbn-ui/side-navigation @elastic/appex-sharedux
364366
src/platform/packages/private/analytics/utils/analytics_collection_utils @elastic/kibana-core
365367
src/platform/packages/private/dashboard/dashboard-navigation-options-common @elastic/kibana-presentation
@@ -915,7 +917,6 @@ src/platform/test/plugin_functional/plugins/core_plugin_route_timeouts @elastic/
915917
src/platform/test/plugin_functional/plugins/core_provider_plugin @elastic/kibana-core
916918
src/platform/test/plugin_functional/plugins/data_search @elastic/kibana-data-discovery
917919
src/platform/test/plugin_functional/plugins/elasticsearch_client_plugin @elastic/kibana-core
918-
src/platform/test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux
919920
src/platform/test/plugin_functional/plugins/hardening @elastic/kibana-security
920921
src/platform/test/plugin_functional/plugins/index_patterns @elastic/kibana-data-discovery
921922
src/platform/test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
@@ -3405,6 +3406,8 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
34053406
/src/core/packages/chrome @elastic/appex-sharedux
34063407
/src/platform/kbn-ui/_tooling @elastic/appex-sharedux
34073408
/src/platform/kbn-ui/chrome-layout @elastic/appex-sharedux
3409+
/src/platform/kbn-ui/chrome-layout-constants @elastic/appex-sharedux
3410+
/src/platform/kbn-ui/chrome-layout-utils @elastic/appex-sharedux
34083411
/src/platform/kbn-ui/side-navigation @elastic/appex-sharedux
34093412
/x-pack/platform/test/serverless/api_integration/test_suites/favorites @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/200985
34103413
/src/platform/test/api_integration/apis/short_url/**/*.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/200209/files#r1846654156

.github/workflows/triage-bulk-needs-team.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

fleet_packages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"name": "elastic_agent",
33-
"version": "2.9.2"
33+
"version": "2.9.3"
3434
},
3535
{
3636
"name": "endpoint",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,6 @@
663663
"@kbn/esql-utils": "link:src/platform/packages/shared/kbn-esql-utils",
664664
"@kbn/esql-ux-example-plugin": "link:examples/esql_ux_example",
665665
"@kbn/esql-validation-example-plugin": "link:examples/esql_validation_example",
666-
"@kbn/eui-provider-dev-warning": "link:src/platform/test/plugin_functional/plugins/eui_provider_dev_warning",
667666
"@kbn/eval-kql": "link:src/platform/packages/shared/kbn-eval-kql",
668667
"@kbn/evals-common": "link:x-pack/platform/packages/shared/kbn-evals-common",
669668
"@kbn/evals-plugin": "link:x-pack/platform/plugins/shared/evals",
@@ -1219,6 +1218,8 @@
12191218
"@kbn/ui-actions-browser": "link:src/platform/packages/shared/kbn-ui-actions-browser",
12201219
"@kbn/ui-actions-plugin": "link:src/platform/plugins/shared/ui_actions",
12211220
"@kbn/ui-chrome-layout": "link:src/platform/kbn-ui/chrome-layout",
1221+
"@kbn/ui-chrome-layout-constants": "link:src/platform/kbn-ui/chrome-layout-constants",
1222+
"@kbn/ui-chrome-layout-utils": "link:src/platform/kbn-ui/chrome-layout-utils",
12221223
"@kbn/ui-settings-plugin": "link:src/platform/test/plugin_functional/plugins/ui_settings_plugin",
12231224
"@kbn/ui-shared-deps-npm": "link:src/platform/packages/private/kbn-ui-shared-deps-npm",
12241225
"@kbn/ui-shared-deps-src": "link:src/platform/packages/private/kbn-ui-shared-deps-src",

src/core/packages/chrome/browser-internal/src/side_effects/handle_eui_dev_provider_warning.tsx

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/core/packages/chrome/browser-internal/src/side_effects/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export type { CspWarningDeps } from './csp_warning';
1313
export { setupAppChangeHandler } from './app_change_handler';
1414
export type { AppChangeHandlerDeps } from './app_change_handler';
1515

16-
export { handleEuiDevProviderWarning } from './handle_eui_dev_provider_warning';
1716
export { handleEuiFullScreenChanges } from './handle_eui_fullscreen_changes';
1817
export { handleSystemColorModeChange } from './handle_system_colormode_change';
1918

src/core/packages/chrome/layout/core-chrome-layout-constants/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ const styles = css`
2222

2323
## API Reference
2424

25-
See [`css_variables.ts`](./src/css_variables.ts) for complete API documentation and [`css_variables.test.ts`](./src/css_variables.test.ts) for usage examples.
25+
See [`@kbn/ui-chrome-layout-constants`](../../../../platform/kbn-ui/chrome-layout-constants) for the implementation and usage examples.
2626

2727
## Related
2828

29+
- [`@kbn/ui-chrome-layout-constants`](../../../../platform/kbn-ui/chrome-layout-constants) - implementation (this package re-exports it)
2930
- [`@kbn/ui-chrome-layout`](../../../../platform/kbn-ui/chrome-layout) - React components using these variables

src/core/packages/chrome/layout/core-chrome-layout-constants/index.ts

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,4 @@
66
* your election, the "Elastic License 2.0", the "GNU Affero General Public
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
9-
export { layoutVar, layoutVarName } from './src/css_variables';
10-
export type {
11-
LayoutVarName,
12-
CSSVarName,
13-
LayoutComponent,
14-
LayoutProperty,
15-
ApplicationComponent,
16-
ApplicationVarName,
17-
} from './src/css_variables';
18-
export { layoutLevels } from './src/levels';
19-
20-
/**
21-
* The ID of the main scroll container in the application.
22-
* `document.getElementById(APP_MAIN_SCROLL_CONTAINER_ID)` can be used to find the main scroll container.
23-
*/
24-
export const APP_MAIN_SCROLL_CONTAINER_ID = 'app-main-scroll';
25-
26-
/**
27-
* The ID of the fixed viewport container in the application.
28-
* This div is rendered by the `AppFixedViewport` component on the top of the application area and can be used to render fixed elements that should not scroll with the main content.
29-
*/
30-
export const APP_FIXED_VIEWPORT_ID = 'app-fixed-viewport';
31-
32-
/**
33-
* Selector for an open EuiFlyout. All flyouts (core overlay service, system flyouts,
34-
* and inline plugin flyouts) render through EuiFlyout which applies this class and role.
35-
*/
36-
export const FLYOUT_SELECTOR = '.euiFlyout[role="dialog"]';
37-
38-
/**
39-
* The ID of the main content container in the application, regardless of the type of the layout used.
40-
* `document.querySelector(MAIN_CONTENT_SELECTORS.join(','))` can be used to find the main content container.
41-
*
42-
* TODO: Potentially allow this to be customizable per-plugin
43-
*/
44-
export const MAIN_CONTENT_SELECTORS = [
45-
'main', // Ideal target for all plugins using KibanaPageTemplate
46-
'[role="main"]', // Fallback for plugins using deprecated EuiPageContent
47-
'.kbnAppWrapper', // Last-ditch fallback for all plugins regardless of page template
48-
];
49-
50-
/**
51-
* The gap (in pixels) between the secondary side navigation panel and the main app content.
52-
*/
53-
export const SIDE_PANEL_CONTENT_GAP = 8;
54-
55-
/**
56-
* The selector for elements that should be included in the focus trap of a flyout.
57-
* This will allow the flyout focus trap to include header and sidenav by default.
58-
*/
59-
export const euiIncludeSelectorInFocusTrap = {
60-
prop: {
61-
'data-eui-includes-in-flyout-focus-trap': true,
62-
},
63-
selector: `[data-eui-includes-in-flyout-focus-trap="true"]`,
64-
};
9+
export * from '@kbn/ui-chrome-layout-constants';

0 commit comments

Comments
 (0)