Skip to content

Commit dabdecb

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into remove_default_timefield
2 parents 840f2b4 + 251bd9a commit dabdecb

513 files changed

Lines changed: 13039 additions & 5224 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.

‎.eslintignore‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ snapshots.js
2121

2222
# plugin overrides
2323
/src/core/lib/kbn_internal_native_observable
24-
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
2524
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
2625
/src/plugins/vis_type_timelion/common/_generated_/**
27-
/x-pack/legacy/plugins/**/__tests__/fixtures/**
2826
/x-pack/plugins/apm/e2e/tmp/*
2927
/x-pack/plugins/canvas/canvas_plugin
3028
/x-pack/plugins/canvas/shareable_runtime/build
3129
/x-pack/plugins/canvas/storybook/build
3230
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
33-
/x-pack/legacy/plugins/infra/common/graphql/types.ts
34-
/x-pack/legacy/plugins/infra/public/graphql/types.ts
35-
/x-pack/legacy/plugins/infra/server/graphql/types.ts
36-
/x-pack/legacy/plugins/maps/public/vendor/**
3731

3832
# package overrides
3933
/packages/elastic-eslint-config-kibana

‎.eslintrc.js‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,7 @@ module.exports = {
410410
errorMessage: `Common code can not import from server or public, use a common directory.`,
411411
},
412412
{
413-
target: [
414-
'src/legacy/**/*',
415-
'(src|x-pack)/plugins/**/(public|server)/**/*',
416-
'examples/**/*',
417-
],
413+
target: ['(src|x-pack)/plugins/**/(public|server)/**/*', 'examples/**/*'],
418414
from: [
419415
'src/core/public/**/*',
420416
'!src/core/public/index.ts', // relative import
@@ -428,8 +424,6 @@ module.exports = {
428424
'!src/core/server/mocks{,.ts}',
429425
'!src/core/server/types{,.ts}',
430426
'!src/core/server/test_utils{,.ts}',
431-
'!src/core/server/utils', // ts alias
432-
'!src/core/server/utils/**/*',
433427
// for absolute imports until fixed in
434428
// https://github.com/elastic/kibana/issues/36096
435429
'!src/core/server/*.test.mocks{,.ts}',
@@ -442,7 +436,6 @@ module.exports = {
442436
},
443437
{
444438
target: [
445-
'src/legacy/**/*',
446439
'(src|x-pack)/plugins/**/(public|server)/**/*',
447440
'examples/**/*',
448441
'!(src|x-pack)/**/*.test.*',
@@ -482,27 +475,14 @@ module.exports = {
482475
},
483476
{
484477
target: ['src/core/**/*'],
485-
from: ['plugins/**/*', 'src/plugins/**/*', 'src/legacy/ui/**/*'],
478+
from: ['plugins/**/*', 'src/plugins/**/*'],
486479
errorMessage: 'The core cannot depend on any plugins.',
487480
},
488481
{
489482
target: ['(src|x-pack)/plugins/*/public/**/*'],
490483
from: ['ui/**/*'],
491484
errorMessage: 'Plugins cannot import legacy UI code.',
492485
},
493-
{
494-
from: ['src/legacy/ui/**/*', 'ui/**/*'],
495-
target: [
496-
'test/plugin_functional/plugins/**/public/np_ready/**/*',
497-
'test/plugin_functional/plugins/**/server/np_ready/**/*',
498-
],
499-
allowSameFolder: true,
500-
errorMessage:
501-
'NP-ready code should not import from /src/legacy/ui/** folder. ' +
502-
'Instead of importing from /src/legacy/ui/** deeply within a np_ready folder, ' +
503-
'import those things once at the top level of your plugin and pass those down, just ' +
504-
'like you pass down `core` and `plugins` objects.',
505-
},
506486
],
507487
},
508488
],

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
108108
/x-pack/test/functional/apps/canvas/ @elastic/kibana-presentation
109109
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
110-
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
111110
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
112111

113112

@@ -146,7 +145,6 @@
146145
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
147146
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
148147
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
149-
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
150148
/src/plugins/tile_map/ @elastic/kibana-gis
151149
/src/plugins/region_map/ @elastic/kibana-gis
152150

@@ -165,7 +163,6 @@
165163
/packages/kbn-utils/ @elastic/kibana-operations
166164
/packages/kbn-cli-dev-mode/ @elastic/kibana-operations
167165
/src/cli/keystore/ @elastic/kibana-operations
168-
/src/legacy/server/warnings/ @elastic/kibana-operations
169166
/.ci/es-snapshots/ @elastic/kibana-operations
170167
/.github/workflows/ @elastic/kibana-operations
171168
/vars/ @elastic/kibana-operations
@@ -202,9 +199,6 @@
202199
/packages/kbn-legacy-logging/ @elastic/kibana-core
203200
/packages/kbn-crypto/ @elastic/kibana-core
204201
/packages/kbn-http-tools/ @elastic/kibana-core
205-
/src/legacy/server/config/ @elastic/kibana-core
206-
/src/legacy/server/http/ @elastic/kibana-core
207-
/src/legacy/server/logging/ @elastic/kibana-core
208202
/src/plugins/status_page/ @elastic/kibana-core
209203
/src/plugins/saved_objects_management/ @elastic/kibana-core
210204
/src/dev/run_check_published_api_changes.ts @elastic/kibana-core
@@ -214,9 +208,6 @@
214208
/src/plugins/kibana_overview/ @elastic/kibana-core
215209
/x-pack/plugins/global_search_bar/ @elastic/kibana-core
216210
#CC# /src/core/server/csp/ @elastic/kibana-core
217-
#CC# /src/legacy/server/config/ @elastic/kibana-core
218-
#CC# /src/legacy/server/http/ @elastic/kibana-core
219-
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-core
220211
#CC# /src/plugins/legacy_export/ @elastic/kibana-core
221212
#CC# /src/plugins/xpack_legacy/ @elastic/kibana-core
222213
#CC# /src/plugins/saved_objects/ @elastic/kibana-core

‎.github/workflows/project-assigner.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v2.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"}, {"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"}]'
14+
issue-mappings: '[{"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"}, {"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"}], {"label": "Feature:Input Controls", "projectNumber": 72, "columnName": "Inbox"}]'
1515
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
1616

1717

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,6 @@ using the CURL scripts in the scripts folder.
452452
|Visualize geo data from Elasticsearch or 3rd party geo-services.
453453
454454
455-
|{kib-repo}blob/{branch}/x-pack/plugins/maps_legacy_licensing/README.md[mapsLegacyLicensing]
456-
|This plugin provides access to the detailed tile map services from Elastic.
457-
458-
459455
|{kib-repo}blob/{branch}/x-pack/plugins/ml/readme.md[ml]
460456
|This plugin provides access to the machine learning features provided by
461457
Elastic.

‎docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Set of helpers used to create `KibanaResponse` to form HTTP response on an incom
1010

1111
```typescript
1212
kibanaResponseFactory: {
13-
custom: <T extends string | Record<string, any> | Error | Buffer | {
13+
custom: <T extends string | Record<string, any> | Error | Buffer | Stream | {
1414
message: string | Error;
1515
attributes?: Record<string, any> | undefined;
16-
} | Stream | undefined>(options: CustomHttpResponseOptions<T>) => KibanaResponse<T>;
16+
} | undefined>(options: CustomHttpResponseOptions<T>) => KibanaResponse<T>;
1717
badRequest: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
1818
unauthorized: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
1919
forbidden: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;

‎docs/development/core/server/kibana-plugin-core-server.legacyservicesetupdeps.core.md‎

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

‎docs/development/core/server/kibana-plugin-core-server.legacyservicesetupdeps.md‎

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

‎docs/development/core/server/kibana-plugin-core-server.legacyservicesetupdeps.plugins.md‎

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

‎docs/development/core/server/kibana-plugin-core-server.legacyservicesetupdeps.uiplugins.md‎

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

0 commit comments

Comments
 (0)