Skip to content

Commit 8ed8d1f

Browse files
committed
Merge branch 'master' into persistablestate/docs
2 parents a062558 + 0074aa4 commit 8ed8d1f

File tree

3,406 files changed

+88142
-49726
lines changed

Some content is hidden

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

3,406 files changed

+88142
-49726
lines changed

.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.17.3
4+
ARG NODE_VERSION=14.17.5
55

66
FROM node:${NODE_VERSION} AS base
77

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ snapshots.js
2727
/x-pack/plugins/canvas/shareable_runtime/build
2828
/x-pack/plugins/canvas/storybook/build
2929
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
30+
/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/server/lib/pdf/assets/**
3031

3132
# package overrides
3233
/packages/elastic-eslint-config-kibana

.github/CODEOWNERS

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
# The #CC# prefix delineates Code Coverage,
66
# used for the 'team' designator within Kibana Stats
77

8+
# Tech leads
9+
/dev_docs @elastic/kibana-tech-leads
10+
/packages/kbn-docs-utils/ @elastic/kibana-tech-leads @elastic/kibana-operations
11+
812
# App
913
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
1014
/x-pack/plugins/lens/ @elastic/kibana-app
@@ -41,6 +45,7 @@
4145
/examples/ui_actions_explorer/ @elastic/kibana-app-services
4246
/examples/url_generators_examples/ @elastic/kibana-app-services
4347
/examples/url_generators_explorer/ @elastic/kibana-app-services
48+
/examples/field_formats_example/ @elastic/kibana-app-services
4449
/packages/elastic-datemath/ @elastic/kibana-app-services
4550
/packages/kbn-interpreter/ @elastic/kibana-app-services
4651
/src/plugins/bfetch/ @elastic/kibana-app-services
@@ -103,6 +108,8 @@
103108
/x-pack/plugins/observability/public/components/shared/exploratory_view @elastic/uptime
104109
/x-pack/test/functional_with_es_ssl/apps/uptime @elastic/uptime
105110
/x-pack/test/functional/apps/uptime @elastic/uptime
111+
/x-pack/test/functional/es_archives/uptime @elastic/uptime
112+
/x-pack/test/functional/services/uptime @elastic/uptime
106113
/x-pack/test/api_integration/apis/uptime @elastic/uptime
107114

108115
# Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
@@ -119,6 +126,12 @@
119126

120127
# Presentation
121128
/src/plugins/dashboard/ @elastic/kibana-presentation
129+
/src/plugins/expression_error/ @elastic/kibana-presentation
130+
/src/plugins/expression_image/ @elastic/kibana-presentation
131+
/src/plugins/expression_metric/ @elastic/kibana-presentation
132+
/src/plugins/expression_repeat_image/ @elastic/kibana-presentation
133+
/src/plugins/expression_reveal_image/ @elastic/kibana-presentation
134+
/src/plugins/expression_shape/ @elastic/kibana-presentation
122135
/src/plugins/input_control_vis/ @elastic/kibana-presentation
123136
/src/plugins/vis_type_markdown/ @elastic/kibana-presentation
124137
/src/plugins/presentation_util/ @elastic/kibana-presentation
@@ -154,14 +167,17 @@
154167

155168
# Maps
156169
#CC# /x-pack/plugins/maps/ @elastic/kibana-gis
170+
/x-pack/plugins/maps/ @elastic/kibana-gis
157171
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
158172
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
159173
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
160174
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
161175
/x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
162176
/x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
163177
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
178+
/src/plugins/maps_legacy/ @elastic/kibana-gis
164179
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
180+
/x-pack/plugins/file_upload @elastic/kibana-gis
165181
/src/plugins/tile_map/ @elastic/kibana-gis
166182
/src/plugins/region_map/ @elastic/kibana-gis
167183
/packages/kbn-mapbox-gl @elastic/kibana-gis
@@ -201,6 +217,7 @@
201217
/test/functional/services/remote @elastic/kibana-qa
202218

203219
# Core
220+
/examples/hello_world/ @elastic/kibana-core
204221
/src/core/ @elastic/kibana-core
205222
/src/plugins/saved_objects_tagging_oss @elastic/kibana-core
206223
/config/kibana.yml @elastic/kibana-core

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ report.asciidoc
7575
# TS incremental build cache
7676
*.tsbuildinfo
7777

78+
# Automatically generated and user-modifiable
79+
/tsconfig.refs.json
80+
7881
# Yarn local mirror content
7982
.yarn-local-mirror
8083

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.17.3
1+
14.17.5

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.17.3
1+
14.17.5

BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
exports_files(
44
[
55
"tsconfig.base.json",
6+
"tsconfig.bazel.json",
67
"tsconfig.browser.json",
8+
"tsconfig.browser_bazel.json",
79
"tsconfig.json",
810
"package.json"
911
],

STYLEGUIDE.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ remove it, don't simply comment it out.
3535

3636
We are gradually moving the Kibana code base over to Prettier. All TypeScript code
3737
and some JavaScript code (check `.eslintrc.js`) is using Prettier to format code. You
38-
can run `node script/eslint --fix` to fix linting issues and apply Prettier formatting.
38+
can run `node scripts/eslint --fix` to fix linting issues and apply Prettier formatting.
3939
We recommend you to enable running ESLint via your IDE.
4040

4141
Whenever possible we are trying to use Prettier and linting over written style guide rules.

WORKSPACE.bazel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1010
# Fetch Node.js rules
1111
http_archive(
1212
name = "build_bazel_rules_nodejs",
13-
sha256 = "8f5f192ba02319254aaf2cdcca00ec12eaafeb979a80a1e946773c520ae0a2c9",
14-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.7.0/rules_nodejs-3.7.0.tar.gz"],
13+
sha256 = "e79c08a488cc5ac40981987d862c7320cee8741122a2649e9b08e850b6f20442",
14+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.8.0/rules_nodejs-3.8.0.tar.gz"],
1515
)
1616

1717
# Now that we have the rules let's import from them to complete the work
1818
load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
1919

2020
# Assure we have at least a given rules_nodejs version
21-
check_rules_nodejs_version(minimum_version_string = "3.7.0")
21+
check_rules_nodejs_version(minimum_version_string = "3.8.0")
2222

2323
# Setup the Node.js toolchain for the architectures we want to support
2424
#
@@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.7.0")
2727
# we can update that rule.
2828
node_repositories(
2929
node_repositories = {
30-
"14.17.3-darwin_amd64": ("node-v14.17.3-darwin-x64.tar.gz", "node-v14.17.3-darwin-x64", "522f85db1d1fe798cba5f601d1bba7b5203ca8797b2bc934ff6f24263f0b7fb2"),
31-
"14.17.3-linux_arm64": ("node-v14.17.3-linux-arm64.tar.xz", "node-v14.17.3-linux-arm64", "80f4143d3c2d4cf3c4420eea3202c7bf16788b0a72fd512e60bfc8066a08a51c"),
32-
"14.17.3-linux_s390x": ("node-v14.17.3-linux-s390x.tar.xz", "node-v14.17.3-linux-s390x", "4f69c30732f94189b9ab98f3100b17f1e4db2000848d56064e887be1c28e81ae"),
33-
"14.17.3-linux_amd64": ("node-v14.17.3-linux-x64.tar.xz", "node-v14.17.3-linux-x64", "d659d78144042a1801f35dd611d0fab137e841cde902b2c6a821163a5e36f105"),
34-
"14.17.3-windows_amd64": ("node-v14.17.3-win-x64.zip", "node-v14.17.3-win-x64", "170fb4f95539d1d7e1295fb2556cb72bee352cdf81a02ffb16cf6d50ad2fefbf"),
30+
"14.17.5-darwin_amd64": ("node-v14.17.5-darwin-x64.tar.gz", "node-v14.17.5-darwin-x64", "2e40ab625b45b9bdfcb963ddd4d65d87ddf1dd37a86b6f8b075cf3d77fe9dc09"),
31+
"14.17.5-linux_arm64": ("node-v14.17.5-linux-arm64.tar.xz", "node-v14.17.5-linux-arm64", "3a2e674b6db50dfde767c427e8f077235bbf6f9236e1b12a4cc3496b12f94bae"),
32+
"14.17.5-linux_s390x": ("node-v14.17.5-linux-s390x.tar.xz", "node-v14.17.5-linux-s390x", "7d40eee3d54241403db12fb3bc420cd776e2b02e89100c45cf5e74a73942e7f6"),
33+
"14.17.5-linux_amd64": ("node-v14.17.5-linux-x64.tar.xz", "node-v14.17.5-linux-x64", "2d759de07a50cd7f75bd73d67e97b0d0e095ee3c413efac7d1b3d1e84ed76fff"),
34+
"14.17.5-windows_amd64": ("node-v14.17.5-win-x64.zip", "node-v14.17.5-win-x64", "a99b7ee08e846e5d1f4e70c4396265542819d79ed9cebcc27760b89571f03cbf"),
3535
},
36-
node_version = "14.17.3",
36+
node_version = "14.17.5",
3737
node_urls = [
3838
"https://nodejs.org/dist/v{version}/{filename}",
3939
],

api_docs/charts.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2539,7 +2539,7 @@
25392539
"text": "Adapters"
25402540
},
25412541
", ",
2542-
"SerializableState",
2542+
"Serializable",
25432543
">>"
25442544
],
25452545
"path": "src/plugins/charts/common/palette.ts",
@@ -2597,7 +2597,7 @@
25972597
"text": "Adapters"
25982598
},
25992599
", ",
2600-
"SerializableState",
2600+
"Serializable",
26012601
">>"
26022602
],
26032603
"path": "src/plugins/charts/common/palette.ts",

0 commit comments

Comments
 (0)