Skip to content

Commit 355dcdf

Browse files
Merge branch 'master' into dev/fix-timeRanges-migrations
2 parents 9c13f36 + 8bf9ea4 commit 355dcdf

File tree

1,398 files changed

+36580
-13021
lines changed

Some content is hidden

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

1,398 files changed

+36580
-13021
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/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: 3 additions & 23 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
],
@@ -1180,7 +1160,7 @@ module.exports = {
11801160
pathGroups: [
11811161
{
11821162
pattern:
1183-
'{../../../../../../,../../../../../,../../../../,../../../,../../,../}{common/,*}__mocks__{*,/**}',
1163+
'{../../../../../../,../../../../../,../../../../,../../../,../../,../,./}{common/,*}__mocks__{*,/**}',
11841164
group: 'unknown',
11851165
},
11861166
{

.github/CODEOWNERS

Lines changed: 1 addition & 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
@@ -348,6 +339,7 @@
348339

349340
# Security Solution sub teams
350341
/x-pack/plugins/case @elastic/security-threat-hunting
342+
/x-pack/plugins/timelines @elastic/security-threat-hunting
351343
/x-pack/test/case_api_integration @elastic/security-threat-hunting
352344
/x-pack/plugins/lists @elastic/security-detections-response
353345

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

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,6 @@ report.asciidoc
7575
.yarn-local-mirror
7676

7777
# Bazel
78-
/bazel
79-
/.bazelrc.user
78+
bazel
79+
bazel-*
80+
.bazelrc.user

0 commit comments

Comments
 (0)