Skip to content

Commit

Permalink
Merge branch 'master' into 93924
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Apr 6, 2021
2 parents e7e199a + 251bd9a commit 3fdff74
Show file tree
Hide file tree
Showing 1,171 changed files with 27,133 additions and 10,174 deletions.
5 changes: 4 additions & 1 deletion .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
.idea
.teamcity
.yarn-local-mirror
/bazel
bazel-bin
bazel-kibana
bazel-out
bazel-testlogs
build
node_modules
target
7 changes: 3 additions & 4 deletions .bazelrc.common
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,16 @@ build --disk_cache=~/.bazel-cache/disk-cache
build --repository_cache=~/.bazel-cache/repository-cache

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

# Prevents the creation of bazel-out dir
build --experimental_no_product_name_out_symlink
# build --experimental_no_product_name_out_symlink

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

# Turn off legacy external runfiles
# This prevents accidentally depending on this feature, which Bazel will remove.
Expand Down
6 changes: 4 additions & 2 deletions .ci/packer_cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

set -e

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

./.ci/packer_cache_for_branch.sh master
./.ci/packer_cache_for_branch.sh 7.x
8 changes: 1 addition & 7 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,13 @@ snapshots.js

# plugin overrides
/src/core/lib/kbn_internal_native_observable
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
/src/plugins/vis_type_timelion/common/_generated_/**
/x-pack/legacy/plugins/**/__tests__/fixtures/**
/x-pack/plugins/apm/e2e/tmp/*
/x-pack/plugins/canvas/canvas_plugin
/x-pack/plugins/canvas/shareable_runtime/build
/x-pack/plugins/canvas/storybook/build
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
/x-pack/legacy/plugins/infra/common/graphql/types.ts
/x-pack/legacy/plugins/infra/public/graphql/types.ts
/x-pack/legacy/plugins/infra/server/graphql/types.ts
/x-pack/legacy/plugins/maps/public/vendor/**

# package overrides
/packages/elastic-eslint-config-kibana
Expand All @@ -48,4 +42,4 @@ snapshots.js
/packages/kbn-monaco/src/painless/antlr

# Bazel
/bazel
/bazel-*
26 changes: 3 additions & 23 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,7 @@ module.exports = {
errorMessage: `Common code can not import from server or public, use a common directory.`,
},
{
target: [
'src/legacy/**/*',
'(src|x-pack)/plugins/**/(public|server)/**/*',
'examples/**/*',
],
target: ['(src|x-pack)/plugins/**/(public|server)/**/*', 'examples/**/*'],
from: [
'src/core/public/**/*',
'!src/core/public/index.ts', // relative import
Expand All @@ -428,8 +424,6 @@ module.exports = {
'!src/core/server/mocks{,.ts}',
'!src/core/server/types{,.ts}',
'!src/core/server/test_utils{,.ts}',
'!src/core/server/utils', // ts alias
'!src/core/server/utils/**/*',
// for absolute imports until fixed in
// https://github.com/elastic/kibana/issues/36096
'!src/core/server/*.test.mocks{,.ts}',
Expand All @@ -442,7 +436,6 @@ module.exports = {
},
{
target: [
'src/legacy/**/*',
'(src|x-pack)/plugins/**/(public|server)/**/*',
'examples/**/*',
'!(src|x-pack)/**/*.test.*',
Expand Down Expand Up @@ -482,27 +475,14 @@ module.exports = {
},
{
target: ['src/core/**/*'],
from: ['plugins/**/*', 'src/plugins/**/*', 'src/legacy/ui/**/*'],
from: ['plugins/**/*', 'src/plugins/**/*'],
errorMessage: 'The core cannot depend on any plugins.',
},
{
target: ['(src|x-pack)/plugins/*/public/**/*'],
from: ['ui/**/*'],
errorMessage: 'Plugins cannot import legacy UI code.',
},
{
from: ['src/legacy/ui/**/*', 'ui/**/*'],
target: [
'test/plugin_functional/plugins/**/public/np_ready/**/*',
'test/plugin_functional/plugins/**/server/np_ready/**/*',
],
allowSameFolder: true,
errorMessage:
'NP-ready code should not import from /src/legacy/ui/** folder. ' +
'Instead of importing from /src/legacy/ui/** deeply within a np_ready folder, ' +
'import those things once at the top level of your plugin and pass those down, just ' +
'like you pass down `core` and `plugins` objects.',
},
],
},
],
Expand Down Expand Up @@ -1180,7 +1160,7 @@ module.exports = {
pathGroups: [
{
pattern:
'{../../../../../../,../../../../../,../../../../,../../../,../../,../}{common/,*}__mocks__{*,/**}',
'{../../../../../../,../../../../../,../../../../,../../../,../../,../,./}{common/,*}__mocks__{*,/**}',
group: 'unknown',
},
{
Expand Down
10 changes: 1 addition & 9 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
/x-pack/test/functional/apps/canvas/ @elastic/kibana-presentation
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation


Expand Down Expand Up @@ -146,7 +145,6 @@
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
/src/plugins/tile_map/ @elastic/kibana-gis
/src/plugins/region_map/ @elastic/kibana-gis

Expand All @@ -165,7 +163,6 @@
/packages/kbn-utils/ @elastic/kibana-operations
/packages/kbn-cli-dev-mode/ @elastic/kibana-operations
/src/cli/keystore/ @elastic/kibana-operations
/src/legacy/server/warnings/ @elastic/kibana-operations
/.ci/es-snapshots/ @elastic/kibana-operations
/.github/workflows/ @elastic/kibana-operations
/vars/ @elastic/kibana-operations
Expand Down Expand Up @@ -202,9 +199,6 @@
/packages/kbn-legacy-logging/ @elastic/kibana-core
/packages/kbn-crypto/ @elastic/kibana-core
/packages/kbn-http-tools/ @elastic/kibana-core
/src/legacy/server/config/ @elastic/kibana-core
/src/legacy/server/http/ @elastic/kibana-core
/src/legacy/server/logging/ @elastic/kibana-core
/src/plugins/status_page/ @elastic/kibana-core
/src/plugins/saved_objects_management/ @elastic/kibana-core
/src/dev/run_check_published_api_changes.ts @elastic/kibana-core
Expand All @@ -214,9 +208,6 @@
/src/plugins/kibana_overview/ @elastic/kibana-core
/x-pack/plugins/global_search_bar/ @elastic/kibana-core
#CC# /src/core/server/csp/ @elastic/kibana-core
#CC# /src/legacy/server/config/ @elastic/kibana-core
#CC# /src/legacy/server/http/ @elastic/kibana-core
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-core
#CC# /src/plugins/legacy_export/ @elastic/kibana-core
#CC# /src/plugins/xpack_legacy/ @elastic/kibana-core
#CC# /src/plugins/saved_objects/ @elastic/kibana-core
Expand Down Expand Up @@ -348,6 +339,7 @@

# Security Solution sub teams
/x-pack/plugins/case @elastic/security-threat-hunting
/x-pack/plugins/timelines @elastic/security-threat-hunting
/x-pack/test/case_api_integration @elastic/security-threat-hunting
/x-pack/plugins/lists @elastic/security-detections-response

Expand Down
20 changes: 9 additions & 11 deletions .github/ISSUE_TEMPLATE/v8_breaking_change.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: 8.0 Breaking change
about: Breaking changes from 7.x -> 8.0
title: "[Breaking change]"
labels: Team:Elasticsearch UI, Feature:Upgrade Assistant, Breaking Change
labels: Feature:Upgrade Assistant, Breaking Change
assignees: ''

---
Expand All @@ -12,8 +12,8 @@ assignees: ''
******* LABEL CHANGES NECESSARY ********
****************************************
Please add a "NeededFor:${TeamName}" label to denote the team that is
requesting the breaking change to be surfaced in the Upgrade Assistant.
Please add a team label to denote the team that the
breaking change is applicable to.
-->

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

**How can we programmatically determine whether the cluster is affected by this breaking change?**
**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)?**

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

<!-- If applicable, describe the manual migration steps and/or link to available docs. -->

**How could we make migration easier with the Upgrade Assistant?**

<!-- This can be as basic as notifying the user about the deprecation and linking to some
migration docs, or as advanced as a dedicated UI for fixing the problem. -->
<!-- Each plugin owner is responsible for registering their deprecations via the service.
Please link to the issue/PR that will add this functionality. -->

**Are there any edge cases?**

Expand Down
3 changes: 3 additions & 0 deletions .github/relabel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
issues:
- missingLabel: needs-team
regex: ^(\:ml)|(Team:.*)$
2 changes: 1 addition & 1 deletion .github/workflows/project-assigner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: elastic/github-actions/project-assigner@v2.0.0
id: project_assigner
with:
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"}]'
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"}]'
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}


5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@ report.asciidoc
.yarn-local-mirror

# Bazel
/bazel
/.bazelrc.user
bazel
bazel-*
.bazelrc.user
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss
build
target
bazel-*
1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# other packages builds and need to be included as inputs
exports_files(
[
"tsconfig.base.json",
"tsconfig.json",
"package.json"
],
Expand Down
2 changes: 1 addition & 1 deletion docs/api/actions-and-connectors/legacy/create.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy Create connector</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<create-connector-api>> instead.
deprecated::[7.13.0,Use <<create-connector-api>> instead.]

Creates a connector.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/actions-and-connectors/legacy/delete.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy Delete connector</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<delete-connector-api>> instead.
deprecated::[7.13.0,Use <<delete-connector-api>> instead.]

Deletes a connector by ID.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/actions-and-connectors/legacy/execute.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy Execute connector</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<execute-connector-api>> instead.
deprecated::[7.13.0,Use <<execute-connector-api>> instead.]

Executes a connector by ID.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/actions-and-connectors/legacy/get.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy Get connector</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<get-connector-api>> instead.
deprecated::[7.13.0,Use <<get-connector-api>> instead.]

Retrieves a connector by ID.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/actions-and-connectors/legacy/get_all.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy Get all connector</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<get-all-connectors-api>> instead.
deprecated::[7.13.0,Use <<get-all-connectors-api>> instead.]

Retrieves all connectors.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/actions-and-connectors/legacy/list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy List all connector types</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<list-connector-types-api>> instead.
deprecated::[7.13.0,Use <<list-connector-types-api>> instead.]

Retrieves a list of all connector types.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/actions-and-connectors/legacy/update.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy Update connector</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<update-connector-api>> instead.
deprecated::[7.13.0,Use <<update-connector-api>> instead.]

Updates the attributes for an existing connector.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/alerting/legacy/create.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy create alert</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<create-rule-api>> instead.
deprecated::[7.13.0,Use <<create-rule-api>> instead.]

Create {kib} alerts.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/alerting/legacy/delete.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy delete alert</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<delete-rule-api>> instead.
deprecated::[7.13.0,Use <<delete-rule-api>> instead.]

Permanently remove an alert.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/alerting/legacy/disable.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy disable alert</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<disable-rule-api>> instead.
deprecated::[7.13.0,Use <<disable-rule-api>> instead.]

Disable an alert.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/alerting/legacy/enable.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy enable alert</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<enable-rule-api>> instead.
deprecated::[7.13.0,Use <<enable-rule-api>> instead.]

Enable an alert.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/alerting/legacy/find.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy find alerts</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<find-rules-api>> instead.
deprecated::[7.13.0,Use <<find-rules-api>> instead.]

Retrieve a paginated set of alerts based on condition.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/alerting/legacy/get.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<titleabbrev>Legacy get alert</titleabbrev>
++++

WARNING: Deprecated in 7.13.0. Use <<get-rule-api>> instead.
deprecated::[7.13.0,Use <<get-rule-api>> instead.]

Retrieve an alert by ID.

Expand Down
Loading

0 comments on commit 3fdff74

Please sign in to comment.