Skip to content

Commit e66254a

Browse files
Merge branch 'master' into kertal-pr-2021-03-30-discover-fix-adding-columns-from-doc-view
2 parents f293bcf + b33022f commit e66254a

File tree

2,879 files changed

+97924
-58092
lines changed

Some content is hidden

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

2,879 files changed

+97924
-58092
lines changed

.bazelignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
.idea
99
.teamcity
1010
.yarn-local-mirror
11-
/bazel
11+
bazel-bin
12+
bazel-kibana
13+
bazel-out
14+
bazel-testlogs
1215
build
1316
node_modules
1417
target

.bazelrc.common

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@ build --disk_cache=~/.bazel-cache/disk-cache
1818
build --repository_cache=~/.bazel-cache/repository-cache
1919

2020
# Bazel will create symlinks from the workspace directory to output artifacts.
21-
# Build results will be placed in a directory called "bazel/bin"
21+
# Build results will be placed in a directory called "bazel-bin"
2222
# This will still create a bazel-out symlink in
2323
# the project directory, which must be excluded from the
2424
# editor's search path.
25-
build --symlink_prefix=bazel/
2625
# To disable the symlinks altogether (including bazel-out) we can use
2726
# build --symlink_prefix=/
2827
# however this makes it harder to find outputs.
2928

3029
# Prevents the creation of bazel-out dir
31-
build --experimental_no_product_name_out_symlink
30+
# build --experimental_no_product_name_out_symlink
3231

3332
# Make direct file system calls to create symlink trees
3433
build --experimental_inprocess_symlink_creation
@@ -83,7 +82,7 @@ test:debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999
8382
run:debug --define=VERBOSE_LOGS=1 -- --node_options=--inspect-brk
8483
# The following option will change the build output of certain rules such as terser and may not be desirable in all cases
8584
# It will also output both the repo cache and action cache to a folder inside the repo
86-
build:debug --compilation_mode=dbg --show_result=1 --disk_cache=bazel/disk-cache --repository_cache=bazel/repository-cache
85+
build:debug --compilation_mode=dbg --show_result=1
8786

8887
# Turn off legacy external runfiles
8988
# This prevents accidentally depending on this feature, which Bazel will remove.

.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

.ci/packer_cache.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
set -e
44

5-
# cache image used by kibana-load-testing project
6-
docker pull "maven:3.6.3-openjdk-8-slim"
5+
if [[ "$(which docker)" != "" && "$(command uname -m)" != "aarch64" ]]; then
6+
# cache image used by kibana-load-testing project
7+
docker pull "maven:3.6.3-openjdk-8-slim"
8+
fi
79

810
./.ci/packer_cache_for_branch.sh master
911
./.ci/packer_cache_for_branch.sh 7.x

.eslintignore

Lines changed: 1 addition & 7 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
@@ -48,4 +42,4 @@ snapshots.js
4842
/packages/kbn-monaco/src/painless/antlr
4943

5044
# Bazel
51-
/bazel
45+
/bazel-*

.eslintrc.js

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
9393
const DEV_PACKAGES = [
9494
'kbn-babel-code-parser',
9595
'kbn-dev-utils',
96+
'kbn-cli-dev-mode',
9697
'kbn-docs-utils',
9798
'kbn-es*',
9899
'kbn-eslint*',
@@ -409,11 +410,7 @@ module.exports = {
409410
errorMessage: `Common code can not import from server or public, use a common directory.`,
410411
},
411412
{
412-
target: [
413-
'src/legacy/**/*',
414-
'(src|x-pack)/plugins/**/(public|server)/**/*',
415-
'examples/**/*',
416-
],
413+
target: ['(src|x-pack)/plugins/**/(public|server)/**/*', 'examples/**/*'],
417414
from: [
418415
'src/core/public/**/*',
419416
'!src/core/public/index.ts', // relative import
@@ -427,8 +424,6 @@ module.exports = {
427424
'!src/core/server/mocks{,.ts}',
428425
'!src/core/server/types{,.ts}',
429426
'!src/core/server/test_utils{,.ts}',
430-
'!src/core/server/utils', // ts alias
431-
'!src/core/server/utils/**/*',
432427
// for absolute imports until fixed in
433428
// https://github.com/elastic/kibana/issues/36096
434429
'!src/core/server/*.test.mocks{,.ts}',
@@ -441,7 +436,6 @@ module.exports = {
441436
},
442437
{
443438
target: [
444-
'src/legacy/**/*',
445439
'(src|x-pack)/plugins/**/(public|server)/**/*',
446440
'examples/**/*',
447441
'!(src|x-pack)/**/*.test.*',
@@ -481,27 +475,14 @@ module.exports = {
481475
},
482476
{
483477
target: ['src/core/**/*'],
484-
from: ['plugins/**/*', 'src/plugins/**/*', 'src/legacy/ui/**/*'],
478+
from: ['plugins/**/*', 'src/plugins/**/*'],
485479
errorMessage: 'The core cannot depend on any plugins.',
486480
},
487481
{
488482
target: ['(src|x-pack)/plugins/*/public/**/*'],
489483
from: ['ui/**/*'],
490484
errorMessage: 'Plugins cannot import legacy UI code.',
491485
},
492-
{
493-
from: ['src/legacy/ui/**/*', 'ui/**/*'],
494-
target: [
495-
'test/plugin_functional/plugins/**/public/np_ready/**/*',
496-
'test/plugin_functional/plugins/**/server/np_ready/**/*',
497-
],
498-
allowSameFolder: true,
499-
errorMessage:
500-
'NP-ready code should not import from /src/legacy/ui/** folder. ' +
501-
'Instead of importing from /src/legacy/ui/** deeply within a np_ready folder, ' +
502-
'import those things once at the top level of your plugin and pass those down, just ' +
503-
'like you pass down `core` and `plugins` objects.',
504-
},
505486
],
506487
},
507488
],
@@ -1179,7 +1160,7 @@ module.exports = {
11791160
pathGroups: [
11801161
{
11811162
pattern:
1182-
'{../../../../../../,../../../../../,../../../../,../../../,../../,../}{common/,*}__mocks__{*,/**}',
1163+
'{../../../../../../,../../../../../,../../../../,../../../,../../,../,./}{common/,*}__mocks__{*,/**}',
11831164
group: 'unknown',
11841165
},
11851166
{

.github/CODEOWNERS

Lines changed: 16 additions & 15 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

@@ -119,18 +119,23 @@
119119

120120
# Machine Learning
121121
/x-pack/plugins/ml/ @elastic/ml-ui
122+
/x-pack/test/accessibility/apps/ml.ts @elastic/ml-ui
123+
/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts @elastic/ml-ui
124+
/x-pack/test/api_integration/apis/ml/ @elastic/ml-ui
125+
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
122126
/x-pack/test/functional/apps/ml/ @elastic/ml-ui
127+
/x-pack/test/functional/es_archives/ml/ @elastic/ml-ui
123128
/x-pack/test/functional/services/ml/ @elastic/ml-ui
124-
/x-pack/test/accessibility/apps/ml.ts @elastic/ml-ui
129+
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
130+
/x-pack/test/functional_with_es_ssl/apps/ml/ @elastic/ml-ui
131+
125132
# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
126133
/x-pack/plugins/transform/ @elastic/ml-ui
127-
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
128-
/x-pack/test/functional/services/transform/ @elastic/ml-ui
129134
/x-pack/test/accessibility/apps/transform.ts @elastic/ml-ui
130-
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
131-
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
132-
135+
/x-pack/test/api_integration/apis/transform/ @elastic/ml-ui
133136
/x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui
137+
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
138+
/x-pack/test/functional/services/transform/ @elastic/ml-ui
134139
/x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
135140

136141
# Maps
@@ -141,7 +146,6 @@
141146
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
142147
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
143148
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
144-
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
145149
/src/plugins/tile_map/ @elastic/kibana-gis
146150
/src/plugins/region_map/ @elastic/kibana-gis
147151

@@ -158,8 +162,8 @@
158162
/packages/kbn-ui-shared-deps/ @elastic/kibana-operations
159163
/packages/kbn-es-archiver/ @elastic/kibana-operations
160164
/packages/kbn-utils/ @elastic/kibana-operations
165+
/packages/kbn-cli-dev-mode/ @elastic/kibana-operations
161166
/src/cli/keystore/ @elastic/kibana-operations
162-
/src/legacy/server/warnings/ @elastic/kibana-operations
163167
/.ci/es-snapshots/ @elastic/kibana-operations
164168
/.github/workflows/ @elastic/kibana-operations
165169
/vars/ @elastic/kibana-operations
@@ -194,9 +198,8 @@
194198
/packages/kbn-config/ @elastic/kibana-core
195199
/packages/kbn-logging/ @elastic/kibana-core
196200
/packages/kbn-legacy-logging/ @elastic/kibana-core
197-
/src/legacy/server/config/ @elastic/kibana-core
198-
/src/legacy/server/http/ @elastic/kibana-core
199-
/src/legacy/server/logging/ @elastic/kibana-core
201+
/packages/kbn-crypto/ @elastic/kibana-core
202+
/packages/kbn-http-tools/ @elastic/kibana-core
200203
/src/plugins/status_page/ @elastic/kibana-core
201204
/src/plugins/saved_objects_management/ @elastic/kibana-core
202205
/src/dev/run_check_published_api_changes.ts @elastic/kibana-core
@@ -206,9 +209,6 @@
206209
/src/plugins/kibana_overview/ @elastic/kibana-core
207210
/x-pack/plugins/global_search_bar/ @elastic/kibana-core
208211
#CC# /src/core/server/csp/ @elastic/kibana-core
209-
#CC# /src/legacy/server/config/ @elastic/kibana-core
210-
#CC# /src/legacy/server/http/ @elastic/kibana-core
211-
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-core
212212
#CC# /src/plugins/legacy_export/ @elastic/kibana-core
213213
#CC# /src/plugins/xpack_legacy/ @elastic/kibana-core
214214
#CC# /src/plugins/saved_objects/ @elastic/kibana-core
@@ -340,6 +340,7 @@
340340

341341
# Security Solution sub teams
342342
/x-pack/plugins/case @elastic/security-threat-hunting
343+
/x-pack/plugins/timelines @elastic/security-threat-hunting
343344
/x-pack/test/case_api_integration @elastic/security-threat-hunting
344345
/x-pack/plugins/lists @elastic/security-detections-response
345346

.github/ISSUE_TEMPLATE/v8_breaking_change.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: 8.0 Breaking change
33
about: Breaking changes from 7.x -> 8.0
44
title: "[Breaking change]"
5-
labels: Team:Elasticsearch UI, Feature:Upgrade Assistant, Breaking Change
5+
labels: Feature:Upgrade Assistant, Breaking Change
66
assignees: ''
77

88
---
@@ -12,8 +12,8 @@ assignees: ''
1212
******* LABEL CHANGES NECESSARY ********
1313
****************************************
1414
15-
Please add a "NeededFor:${TeamName}" label to denote the team that is
16-
requesting the breaking change to be surfaced in the Upgrade Assistant.
15+
Please add a team label to denote the team that the
16+
breaking change is applicable to.
1717
1818
-->
1919

@@ -30,16 +30,14 @@ requesting the breaking change to be surfaced in the Upgrade Assistant.
3030
<!-- e.g. Based on telemetry data, roughly 75% of our users will need to make changes to x. -->
3131
<!-- e.g. A majority of users will need to make changes to x. -->
3232

33-
**How can we programmatically determine whether the cluster is affected by this breaking change?**
33+
**Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
3434

35-
**What can users do to address the change manually?**
35+
<!-- The deprecation service is consumed by the Upgrade Assistant to surface Kibana deprecations.
36+
It provides a way for Kibana deprecations to be resolved automatically via an API
37+
or manually by providing step-by-step instructions for users to follow. -->
3638

37-
<!-- If applicable, describe the manual migration steps and/or link to available docs. -->
38-
39-
**How could we make migration easier with the Upgrade Assistant?**
40-
41-
<!-- This can be as basic as notifying the user about the deprecation and linking to some
42-
migration docs, or as advanced as a dedicated UI for fixing the problem. -->
39+
<!-- Each plugin owner is responsible for registering their deprecations via the service.
40+
Please link to the issue/PR that will add this functionality. -->
4341

4442
**Are there any edge cases?**
4543

.github/relabel.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
issues:
2+
- missingLabel: needs-team
3+
regex: ^(\:ml)|(Team:.*)$

.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-

0 commit comments

Comments
 (0)