Skip to content

Commit f829c2d

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into issue_95418
2 parents 87072c8 + e871e84 commit f829c2d

1,367 files changed

Lines changed: 34165 additions & 30446 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.

‎.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=14.16.0
4+
ARG NODE_VERSION=14.16.1
55

66
FROM node:${NODE_VERSION} AS base
77

‎.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: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979

8080
# Uptime
8181
/x-pack/plugins/uptime @elastic/uptime
82+
/x-pack/plugins/observability/public/components/shared/exploratory_view @elastic/uptime
8283
/x-pack/test/functional_with_es_ssl/apps/uptime @elastic/uptime
8384
/x-pack/test/functional/apps/uptime @elastic/uptime
8485
/x-pack/test/api_integration/apis/uptime @elastic/uptime
@@ -107,7 +108,6 @@
107108
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
108109
/x-pack/test/functional/apps/canvas/ @elastic/kibana-presentation
109110
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
110-
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
111111
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
112112

113113

@@ -146,7 +146,6 @@
146146
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
147147
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
148148
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
149-
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
150149
/src/plugins/tile_map/ @elastic/kibana-gis
151150
/src/plugins/region_map/ @elastic/kibana-gis
152151

@@ -165,7 +164,6 @@
165164
/packages/kbn-utils/ @elastic/kibana-operations
166165
/packages/kbn-cli-dev-mode/ @elastic/kibana-operations
167166
/src/cli/keystore/ @elastic/kibana-operations
168-
/src/legacy/server/warnings/ @elastic/kibana-operations
169167
/.ci/es-snapshots/ @elastic/kibana-operations
170168
/.github/workflows/ @elastic/kibana-operations
171169
/vars/ @elastic/kibana-operations
@@ -202,9 +200,6 @@
202200
/packages/kbn-legacy-logging/ @elastic/kibana-core
203201
/packages/kbn-crypto/ @elastic/kibana-core
204202
/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
208203
/src/plugins/status_page/ @elastic/kibana-core
209204
/src/plugins/saved_objects_management/ @elastic/kibana-core
210205
/src/dev/run_check_published_api_changes.ts @elastic/kibana-core
@@ -214,9 +209,6 @@
214209
/src/plugins/kibana_overview/ @elastic/kibana-core
215210
/x-pack/plugins/global_search_bar/ @elastic/kibana-core
216211
#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
220212
#CC# /src/plugins/legacy_export/ @elastic/kibana-core
221213
#CC# /src/plugins/xpack_legacy/ @elastic/kibana-core
222214
#CC# /src/plugins/saved_objects/ @elastic/kibana-core

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,5 @@ 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 }}
16-
17-

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.0
1+
14.16.1

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.0
1+
14.16.1

‎NOTICE.txt‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -261,33 +261,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
261261
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
262262
THE SOFTWARE.
263263

264-
---
265-
This product bundles childnode-remove which is available under a
266-
"MIT" license.
267-
268-
The MIT License (MIT)
269-
270-
Copyright (c) 2016-present, jszhou
271-
https://github.com/jserz/js_piece
272-
273-
Permission is hereby granted, free of charge, to any person obtaining a copy
274-
of this software and associated documentation files (the "Software"), to deal
275-
in the Software without restriction, including without limitation the rights
276-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
277-
copies of the Software, and to permit persons to whom the Software is
278-
furnished to do so, subject to the following conditions:
279-
280-
The above copyright notice and this permission notice shall be included in
281-
all copies or substantial portions of the Software.
282-
283-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
284-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
285-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
286-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
287-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
288-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
289-
THE SOFTWARE.
290-
291264
---
292265
This product bundles code based on probot-metadata@1.0.0 which is
293266
available under a "MIT" license.

‎WORKSPACE.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.2.3")
2727
# we can update that rule.
2828
node_repositories(
2929
node_repositories = {
30-
"14.16.0-darwin_amd64": ("node-v14.16.0-darwin-x64.tar.gz", "node-v14.16.0-darwin-x64", "14ec767e376d1e2e668f997065926c5c0086ec46516d1d45918af8ae05bd4583"),
31-
"14.16.0-linux_arm64": ("node-v14.16.0-linux-arm64.tar.xz", "node-v14.16.0-linux-arm64", "440489a08bfd020e814c9e65017f58d692299ac3f150c8e78d01abb1104c878a"),
32-
"14.16.0-linux_s390x": ("node-v14.16.0-linux-s390x.tar.xz", "node-v14.16.0-linux-s390x", "335348e46f45284b6356416ef58f85602d2dee99094588b65900f6c8839df77e"),
33-
"14.16.0-linux_amd64": ("node-v14.16.0-linux-x64.tar.xz", "node-v14.16.0-linux-x64", "2e079cf638766fedd720d30ec8ffef5d6ceada4e8b441fc2a093cb9a865f4087"),
34-
"14.16.0-windows_amd64": ("node-v14.16.0-win-x64.zip", "node-v14.16.0-win-x64", "716045c2f16ea10ca97bd04cf2e5ef865f9c4d6d677a9bc25e2ea522b594af4f"),
30+
"14.16.1-darwin_amd64": ("node-v14.16.1-darwin-x64.tar.gz", "node-v14.16.1-darwin-x64", "b762b72fc149629b7e394ea9b75a093cad709a9f2f71480942945d8da0fc1218"),
31+
"14.16.1-linux_arm64": ("node-v14.16.1-linux-arm64.tar.xz", "node-v14.16.1-linux-arm64", "b4d474e79f7d33b3b4430fad25c3f836b82ce2d5bb30d4a2c9fa20df027e40da"),
32+
"14.16.1-linux_s390x": ("node-v14.16.1-linux-s390x.tar.xz", "node-v14.16.1-linux-s390x", "af9982fef32e4a3e4a5d66741dcf30ac9c27613bd73582fa1dae1fb25003047a"),
33+
"14.16.1-linux_amd64": ("node-v14.16.1-linux-x64.tar.xz", "node-v14.16.1-linux-x64", "85a89d2f68855282c87851c882d4c4bbea4cd7f888f603722f0240a6e53d89df"),
34+
"14.16.1-windows_amd64": ("node-v14.16.1-win-x64.zip", "node-v14.16.1-win-x64", "e469db37b4df74627842d809566c651042d86f0e6006688f0f5fe3532c6dfa41"),
3535
},
36-
node_version = "14.16.0",
36+
node_version = "14.16.1",
3737
node_urls = [
3838
"https://nodejs.org/dist/v{version}/{filename}",
3939
],

‎api_docs/data_ui.json‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,34 @@
415415
"signature": [
416416
"string | undefined"
417417
]
418+
},
419+
{
420+
"tags": [],
421+
"id": "def-public.QueryStringInputProps.autoSubmit",
422+
"type": "CompoundType",
423+
"label": "autoSubmit",
424+
"description": [],
425+
"source": {
426+
"path": "src/plugins/data/public/ui/query_string_input/query_string_input.tsx",
427+
"lineNumber": 72
428+
},
429+
"signature": [
430+
"boolean | undefined"
431+
]
432+
},
433+
{
434+
"tags": [],
435+
"id": "def-public.QueryStringInputProps.storageKey",
436+
"type": "string",
437+
"label": "storageKey",
438+
"description": [],
439+
"source": {
440+
"path": "src/plugins/data/public/ui/query_string_input/query_string_input.tsx",
441+
"lineNumber": 76
442+
},
443+
"signature": [
444+
"string | undefined"
445+
]
418446
}
419447
],
420448
"source": {
@@ -460,15 +488,15 @@
460488
"section": "def-public.SearchBarProps",
461489
"text": "SearchBarProps"
462490
},
463-
", \"filters\" | \"query\" | \"intl\" | \"indexPatterns\" | \"isLoading\" | \"customSubmitButton\" | \"screenTitle\" | \"dataTestSubj\" | \"showQueryBar\" | \"showQueryInput\" | \"showFilterBar\" | \"showDatePicker\" | \"showAutoRefreshOnly\" | \"isRefreshPaused\" | \"refreshInterval\" | \"dateRangeFrom\" | \"dateRangeTo\" | \"showSaveQuery\" | \"savedQuery\" | \"onQueryChange\" | \"onQuerySubmit\" | \"onSaved\" | \"onSavedQueryUpdated\" | \"onClearSavedQuery\" | \"onRefresh\" | \"indicateNoData\" | \"placeholder\" | \"isClearable\" | \"iconType\" | \"nonKqlMode\" | \"nonKqlModeHelpText\" | \"timeHistory\" | \"onFiltersUpdated\" | \"onRefreshChange\">, \"filters\" | \"query\" | \"indexPatterns\" | \"isLoading\" | \"customSubmitButton\" | \"screenTitle\" | \"dataTestSubj\" | \"showQueryBar\" | \"showQueryInput\" | \"showFilterBar\" | \"showDatePicker\" | \"showAutoRefreshOnly\" | \"isRefreshPaused\" | \"refreshInterval\" | \"dateRangeFrom\" | \"dateRangeTo\" | \"showSaveQuery\" | \"savedQuery\" | \"onQueryChange\" | \"onQuerySubmit\" | \"onSaved\" | \"onSavedQueryUpdated\" | \"onClearSavedQuery\" | \"onRefresh\" | \"indicateNoData\" | \"placeholder\" | \"isClearable\" | \"iconType\" | \"nonKqlMode\" | \"nonKqlModeHelpText\" | \"timeHistory\" | \"onFiltersUpdated\" | \"onRefreshChange\">, any> & { WrappedComponent: React.ComponentType<Pick<",
491+
", \"filters\" | \"query\" | \"intl\" | \"indexPatterns\" | \"isLoading\" | \"customSubmitButton\" | \"screenTitle\" | \"dataTestSubj\" | \"showQueryBar\" | \"showQueryInput\" | \"showFilterBar\" | \"showDatePicker\" | \"showAutoRefreshOnly\" | \"isRefreshPaused\" | \"refreshInterval\" | \"dateRangeFrom\" | \"dateRangeTo\" | \"showSaveQuery\" | \"savedQuery\" | \"onQueryChange\" | \"onQuerySubmit\" | \"onSaved\" | \"onSavedQueryUpdated\" | \"onClearSavedQuery\" | \"onRefresh\" | \"indicateNoData\" | \"placeholder\" | \"isClearable\" | \"iconType\" | \"nonKqlMode\" | \"nonKqlModeHelpText\" | \"storageKey\" | \"disableLanguageSwitcher\" | \"isInvalid\" | \"autoSubmit\" | \"timeHistory\" | \"onFiltersUpdated\" | \"onRefreshChange\">, \"filters\" | \"query\" | \"indexPatterns\" | \"isLoading\" | \"customSubmitButton\" | \"screenTitle\" | \"dataTestSubj\" | \"showQueryBar\" | \"showQueryInput\" | \"showFilterBar\" | \"showDatePicker\" | \"showAutoRefreshOnly\" | \"isRefreshPaused\" | \"refreshInterval\" | \"dateRangeFrom\" | \"dateRangeTo\" | \"showSaveQuery\" | \"savedQuery\" | \"onQueryChange\" | \"onQuerySubmit\" | \"onSaved\" | \"onSavedQueryUpdated\" | \"onClearSavedQuery\" | \"onRefresh\" | \"indicateNoData\" | \"placeholder\" | \"isClearable\" | \"iconType\" | \"nonKqlMode\" | \"nonKqlModeHelpText\" | \"storageKey\" | \"disableLanguageSwitcher\" | \"isInvalid\" | \"autoSubmit\" | \"timeHistory\" | \"onFiltersUpdated\" | \"onRefreshChange\">, any> & { WrappedComponent: React.ComponentType<Pick<",
464492
{
465493
"pluginId": "data",
466494
"scope": "public",
467495
"docId": "kibDataUiPluginApi",
468496
"section": "def-public.SearchBarProps",
469497
"text": "SearchBarProps"
470498
},
471-
", \"filters\" | \"query\" | \"intl\" | \"indexPatterns\" | \"isLoading\" | \"customSubmitButton\" | \"screenTitle\" | \"dataTestSubj\" | \"showQueryBar\" | \"showQueryInput\" | \"showFilterBar\" | \"showDatePicker\" | \"showAutoRefreshOnly\" | \"isRefreshPaused\" | \"refreshInterval\" | \"dateRangeFrom\" | \"dateRangeTo\" | \"showSaveQuery\" | \"savedQuery\" | \"onQueryChange\" | \"onQuerySubmit\" | \"onSaved\" | \"onSavedQueryUpdated\" | \"onClearSavedQuery\" | \"onRefresh\" | \"indicateNoData\" | \"placeholder\" | \"isClearable\" | \"iconType\" | \"nonKqlMode\" | \"nonKqlModeHelpText\" | \"timeHistory\" | \"onFiltersUpdated\" | \"onRefreshChange\"> & ReactIntl.InjectedIntlProps>; }"
499+
", \"filters\" | \"query\" | \"intl\" | \"indexPatterns\" | \"isLoading\" | \"customSubmitButton\" | \"screenTitle\" | \"dataTestSubj\" | \"showQueryBar\" | \"showQueryInput\" | \"showFilterBar\" | \"showDatePicker\" | \"showAutoRefreshOnly\" | \"isRefreshPaused\" | \"refreshInterval\" | \"dateRangeFrom\" | \"dateRangeTo\" | \"showSaveQuery\" | \"savedQuery\" | \"onQueryChange\" | \"onQuerySubmit\" | \"onSaved\" | \"onSavedQueryUpdated\" | \"onClearSavedQuery\" | \"onRefresh\" | \"indicateNoData\" | \"placeholder\" | \"isClearable\" | \"iconType\" | \"nonKqlMode\" | \"nonKqlModeHelpText\" | \"storageKey\" | \"disableLanguageSwitcher\" | \"isInvalid\" | \"autoSubmit\" | \"timeHistory\" | \"onFiltersUpdated\" | \"onRefreshChange\"> & ReactIntl.InjectedIntlProps>; }"
472500
],
473501
"initialIsOpen": false
474502
},
@@ -480,7 +508,7 @@
480508
"description": [],
481509
"source": {
482510
"path": "src/plugins/data/public/ui/search_bar/search_bar.tsx",
483-
"lineNumber": 80
511+
"lineNumber": 84
484512
},
485513
"signature": [
486514
"SearchBarOwnProps & SearchBarInjectedDeps"
@@ -521,4 +549,4 @@
521549
"misc": [],
522550
"objects": []
523551
}
524-
}
552+
}

0 commit comments

Comments
 (0)