Skip to content

Commit 92cd7d8

Browse files
Merge branch 'main' into conditional_rendering_in_expandable_section
2 parents 3ce29fe + 67312ab commit 92cd7d8

File tree

3,728 files changed

+113832
-31518
lines changed

Some content is hidden

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

3,728 files changed

+113832
-31518
lines changed

.backportrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"repoName": "kibana",
44
"targetBranchChoices": [
55
"main",
6+
"8.9",
67
"8.8",
78
"8.7",
89
"8.6",
@@ -45,7 +46,7 @@
4546
"backport"
4647
],
4748
"branchLabelMapping": {
48-
"^v8.9.0$": "main",
49+
"^v8.10.0$": "main",
4950
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
5051
},
5152
"autoMerge": true,

.buildkite/ftr_configs.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ disabled:
5555

5656
# Elastic Synthetics configs
5757
- x-pack/plugins/synthetics/e2e/config.ts
58-
- x-pack/plugins/synthetics/e2e/uptime/synthetics_run.ts
58+
- x-pack/plugins/uptime/e2e/uptime/synthetics_run.ts
5959
- x-pack/plugins/synthetics/e2e/synthetics/synthetics_run.ts
6060
- x-pack/plugins/ux/e2e/synthetics_run.ts
6161
- x-pack/plugins/exploratory_view/e2e/synthetics_run.ts
@@ -196,6 +196,7 @@ enabled:
196196
- x-pack/test/api_integration/apis/security/config.ts
197197
- x-pack/test/api_integration/apis/security_solution/config.ts
198198
- x-pack/test/api_integration/apis/spaces/config.ts
199+
- x-pack/test/api_integration/apis/stats/config.ts
199200
- x-pack/test/api_integration/apis/status/config.ts
200201
- x-pack/test/api_integration/apis/synthetics/config.ts
201202
- x-pack/test/api_integration/apis/telemetry/config.ts
@@ -264,6 +265,7 @@ enabled:
264265
- x-pack/test/functional/apps/data_views/config.ts
265266
- x-pack/test/functional/apps/dev_tools/config.ts
266267
- x-pack/test/functional/apps/discover/config.ts
268+
- x-pack/test/functional/apps/discover_log_explorer/config.ts
267269
- x-pack/test/functional/apps/graph/config.ts
268270
- x-pack/test/functional/apps/grok_debugger/config.ts
269271
- x-pack/test/functional/apps/home/config.ts
@@ -327,6 +329,8 @@ enabled:
327329
- x-pack/test/observability_api_integration/trial/config.ts
328330
- x-pack/test/observability_api_integration/apis/config.ts
329331
- x-pack/test/observability_functional/with_rac_write.config.ts
332+
- x-pack/test/observability_onboarding_api_integration/basic/config.ts
333+
- x-pack/test/observability_onboarding_api_integration/cloud/config.ts
330334
- x-pack/test/plugin_api_integration/config.ts
331335
- x-pack/test/plugin_functional/config.ts
332336
- x-pack/test/reporting_api_integration/reporting_and_security.config.ts
@@ -399,3 +403,4 @@ enabled:
399403
- x-pack/performance/journeys/dashboard_listing_page.ts
400404
- x-pack/performance/journeys/cloud_security_dashboard.ts
401405
- x-pack/test/custom_branding/config.ts
406+
- x-pack/test/profiling_api_integration/cloud/config.ts

.buildkite/pipelines/flaky_tests/pipeline.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,17 @@ for (const testSuite of testSuites) {
153153
continue;
154154
}
155155

156-
const keyParts = testSuite.key.split('/');
157-
switch (keyParts[0]) {
156+
const [category, suiteName] = testSuite.key.split('/');
157+
switch (category) {
158158
case 'cypress':
159-
const CYPRESS_SUITE = keyParts[1];
160-
const group = groups.find((g) => g.key.includes(CYPRESS_SUITE));
159+
const group = groups.find((g) => g.key === testSuite.key);
161160
if (!group) {
162161
throw new Error(
163-
`Group configuration was not found in groups.json for the following cypress suite: {${CYPRESS_SUITE}}.`
162+
`Group configuration was not found in groups.json for the following cypress suite: {${suiteName}}.`
164163
);
165164
}
166165
steps.push({
167-
command: `.buildkite/scripts/steps/functional/${CYPRESS_SUITE}.sh`,
166+
command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
168167
label: group.name,
169168
agents: { queue: 'n2-4-spot' },
170169
depends_on: 'build',

.buildkite/scripts/steps/functional/uptime_plugin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Uptime plugin @elastic/synthetics Tests"
1313

1414
cd "$XPACK_DIR"
1515

16-
node plugins/synthetics/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
16+
node plugins/uptime/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.buildkite/scripts/steps/storybooks/build_and_upload.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const STORYBOOKS = [
2626
'dashboard_enhanced',
2727
'dashboard',
2828
'data',
29+
'discover_log_explorer',
2930
'embeddable',
3031
'expression_error',
3132
'expression_image',
@@ -43,6 +44,7 @@ const STORYBOOKS = [
4344
'observability',
4445
'presentation',
4546
'security_solution',
47+
'security_solution_packages',
4648
'serverless',
4749
'shared_ux',
4850
'triggers_actions_ui',

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=16.19.1
4+
ARG NODE_VERSION=16.20.1
55

66
FROM node:${NODE_VERSION} AS base
77

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ const RESTRICTED_IMPORTS = [
245245
},
246246
{
247247
name: 'react-router-dom',
248-
importNames: ['Route'],
248+
importNames: ['Router', 'Switch', 'Route'],
249249
message: 'Please use @kbn/shared-ux-router instead',
250250
},
251251
{
@@ -604,6 +604,7 @@ module.exports = {
604604
'**/cypress.config.{js,ts}',
605605
'x-pack/test_serverless/**/config*.ts',
606606
'x-pack/test_serverless/*/test_suites/**/*',
607+
'x-pack/test/profiling_api_integration/**/*.ts',
607608
],
608609
rules: {
609610
'import/no-default-export': 'off',

.github/CODEOWNERS

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,23 @@ x-pack/plugins/dashboard_enhanced @elastic/kibana-presentation
302302
src/plugins/dashboard @elastic/kibana-presentation
303303
src/plugins/data @elastic/kibana-visualizations @elastic/kibana-data-discovery
304304
test/plugin_functional/plugins/data_search @elastic/kibana-app-services
305+
packages/kbn-data-service @elastic/kibana-visualizations @elastic/kibana-data-discovery
305306
src/plugins/data_view_editor @elastic/kibana-data-discovery
306307
examples/data_view_field_editor_example @elastic/kibana-app-services
307308
src/plugins/data_view_field_editor @elastic/kibana-data-discovery
308309
src/plugins/data_view_management @elastic/kibana-data-discovery
309310
src/plugins/data_views @elastic/kibana-data-discovery
310311
x-pack/plugins/data_visualizer @elastic/ml-ui
311312
packages/kbn-datemath @elastic/kibana-data-discovery
312-
packages/deeplinks/analytics @elastic/kibana-data-discovery
313+
packages/deeplinks/analytics @elastic/kibana-data-discovery @elastic/kibana-presentation @elastic/kibana-visualizations
313314
packages/deeplinks/devtools @elastic/platform-deployment-management
314-
packages/deeplinks/management @elastic/platform-deployment-management @elastic/kibana-data-discovery
315+
packages/deeplinks/management @elastic/platform-deployment-management
315316
packages/deeplinks/ml @elastic/ml-ui
316317
packages/deeplinks/observability @elastic/apm-ui
317318
packages/deeplinks/search @elastic/enterprise-search-frontend
318-
packages/default-nav/analytics @elastic/kibana-data-discovery
319+
packages/default-nav/analytics @elastic/kibana-data-discovery @elastic/kibana-presentation @elastic/kibana-visualizations
319320
packages/default-nav/devtools @elastic/platform-deployment-management
320-
packages/default-nav/management @elastic/platform-deployment-management @elastic/kibana-data-discovery
321+
packages/default-nav/management @elastic/platform-deployment-management
321322
packages/default-nav/ml @elastic/ml-ui
322323
packages/kbn-dev-cli-errors @elastic/kibana-operations
323324
packages/kbn-dev-cli-runner @elastic/kibana-operations
@@ -327,8 +328,9 @@ packages/kbn-dev-utils @elastic/kibana-operations
327328
examples/developer_examples @elastic/appex-sharedux
328329
examples/discover_customization_examples @elastic/kibana-data-discovery
329330
x-pack/plugins/discover_enhanced @elastic/kibana-data-discovery
331+
x-pack/plugins/discover_log_explorer @elastic/infra-monitoring-ui
330332
src/plugins/discover @elastic/kibana-data-discovery
331-
packages/kbn-doc-links @elastic/kibana-docs
333+
packages/kbn-doc-links @elastic/docs
332334
packages/kbn-docs-utils @elastic/kibana-operations
333335
packages/kbn-dom-drag-drop @elastic/kibana-visualizations @elastic/kibana-data-discovery
334336
packages/kbn-ebt-tools @elastic/kibana-core
@@ -400,6 +402,7 @@ packages/kbn-ftr-common-functional-services @elastic/kibana-operations @elastic/
400402
packages/kbn-ftr-screenshot-filename @elastic/kibana-operations @elastic/appex-qa
401403
x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops
402404
packages/kbn-generate @elastic/kibana-operations
405+
packages/kbn-generate-console-definitions @elastic/platform-deployment-management
403406
packages/kbn-generate-csv @elastic/appex-sharedux
404407
packages/kbn-generate-csv-types @elastic/appex-sharedux
405408
packages/kbn-get-repo-files @elastic/kibana-operations
@@ -719,11 +722,12 @@ test/plugin_functional/plugins/ui_settings_plugin @elastic/kibana-core
719722
packages/kbn-ui-shared-deps-npm @elastic/kibana-operations
720723
packages/kbn-ui-shared-deps-src @elastic/kibana-operations
721724
packages/kbn-ui-theme @elastic/kibana-operations
725+
packages/kbn-unified-field-list @elastic/kibana-data-discovery
722726
examples/unified_field_list_examples @elastic/kibana-data-discovery
723-
src/plugins/unified_field_list @elastic/kibana-data-discovery
724727
src/plugins/unified_histogram @elastic/kibana-data-discovery
725728
src/plugins/unified_search @elastic/kibana-visualizations
726729
x-pack/plugins/upgrade_assistant @elastic/platform-deployment-management
730+
x-pack/plugins/uptime @elastic/uptime
727731
x-pack/plugins/drilldowns/url_drilldown @elastic/kibana-app-services
728732
src/plugins/url_forwarding @elastic/kibana-visualizations
729733
packages/kbn-url-state @elastic/security-threat-hunting-investigations
@@ -817,13 +821,13 @@ packages/kbn-yarn-lock-validator @elastic/kibana-operations
817821
#CC# /x-pack/plugins/reporting/ @elastic/appex-sharedux
818822
#CC# /x-pack/plugins/serverless_security/ @elastic/appex-sharedux
819823

820-
### Observability packages
824+
### Observability Plugins
821825

822-
# Observability App > Alert Details
826+
# Actionable observability
823827
x-pack/packages/observability/alert_details @elastic/actionable-observability
824-
825-
# Observability App > Functional Tests
826828
x-pack/test/observability_functional @elastic/actionable-observability
829+
x-pack/plugins/infra/public/alerting @elastic/actionable-observability
830+
x-pack/plugins/infra/server/lib/alerting @elastic/actionable-observability
827831

828832
# Observability robots
829833
/.github/workflows/deploy-my-kibana.yml @elastic/observablt-robots
@@ -1260,6 +1264,9 @@ x-pack/test/threat_intelligence_cypress @elastic/protections-experience
12601264
# Changes to translation files should not ping code reviewers
12611265
x-pack/plugins/translations/translations
12621266

1267+
# Profiling api integration testing
1268+
x-pack/test/profiling_api_integration @elastic/profiling-ui
1269+
12631270
####
12641271
## These rules are always last so they take ultimate priority over everything else
12651272
####

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ npm-debug.log*
9292

9393
## @cypress/snapshot from apm plugin
9494
/snapshots.js
95-
x-pack/plugins/apm/scripts/apm-diagnostics*.json
95+
/apm-diagnostics*.json
9696

9797
# transpiled cypress config
9898
x-pack/plugins/fleet/cypress.config.d.ts
@@ -132,3 +132,4 @@ fleet-server.yml
132132
**/.journeys/
133133
x-pack/test/security_api_integration/plugins/audit_log/audit.log
134134

135+

.i18nrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"statusPage": "src/legacy/core_plugins/status_page",
9494
"telemetry": ["src/plugins/telemetry", "src/plugins/telemetry_management_section"],
9595
"timelion": ["src/plugins/vis_types/timelion"],
96-
"uiActions": "src/plugins/ui_actions",
96+
"uiActions": ["src/plugins/ui_actions", "packages/kbn-ui-actions-browser"],
9797
"uiActionsEnhanced": "src/plugins/ui_actions_enhanced",
9898
"uiActionsExamples": "examples/ui_action_examples",
9999
"usageCollection": "src/plugins/usage_collection",
@@ -114,7 +114,7 @@
114114
"visualizations": "src/plugins/visualizations",
115115
"visualizationUiComponents": "src/plugins/visualization_ui_components",
116116
"unifiedSearch": "src/plugins/unified_search",
117-
"unifiedFieldList": "src/plugins/unified_field_list",
117+
"unifiedFieldList": "packages/kbn-unified-field-list",
118118
"unifiedHistogram": "src/plugins/unified_histogram"
119119
},
120120
"translations": []

0 commit comments

Comments
 (0)