Skip to content

Commit 2e46196

Browse files
Merge branch 'master' into event-log/rx-buffer
2 parents 1a7134d + 514b50e commit 2e46196

File tree

1,159 files changed

+24434
-6331
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,159 files changed

+24434
-6331
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=12.19.0
4+
ARG NODE_VERSION=12.19.1
55

66
FROM node:${NODE_VERSION} AS base
77

.ci/build_docker.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
cd "$(dirname "${0}")"
6+
7+
cp /usr/local/bin/runbld ./
8+
cp /usr/local/bin/bash_standard_lib.sh ./
9+
10+
docker build -t kibana-ci -f ./Dockerfile .

.ci/packer_cache_for_branch.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
5353

5454
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
5555

56+
.ci/build_docker.sh
57+
5658
if [[ "$branch" != "master" ]]; then
5759
rm --preserve-root -rf "$checkoutDir"
5860
fi

.eslintrc.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,8 @@ module.exports = {
863863
'no-shadow-restricted-names': 'error',
864864
'no-sparse-arrays': 'error',
865865
'no-this-before-super': 'error',
866-
'no-undef': 'error',
866+
// rely on typescript
867+
'no-undef': 'off',
867868
'no-unreachable': 'error',
868869
'no-unsafe-finally': 'error',
869870
'no-useless-call': 'error',
@@ -998,7 +999,8 @@ module.exports = {
998999
'no-shadow-restricted-names': 'error',
9991000
'no-sparse-arrays': 'error',
10001001
'no-this-before-super': 'error',
1001-
'no-undef': 'error',
1002+
// rely on typescript
1003+
'no-undef': 'off',
10021004
'no-unreachable': 'error',
10031005
'no-unsafe-finally': 'error',
10041006
'no-useless-call': 'error',

.github/CODEOWNERS

Lines changed: 65 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
1010
/x-pack/plugins/lens/ @elastic/kibana-app
1111
/x-pack/plugins/graph/ @elastic/kibana-app
12+
/x-pack/plugins/vis_type_timeseries_enhanced/ @elastic/kibana-app
1213
/src/plugins/advanced_settings/ @elastic/kibana-app
1314
/src/plugins/charts/ @elastic/kibana-app
1415
/src/plugins/discover/ @elastic/kibana-app
@@ -29,40 +30,40 @@
2930
/src/plugins/visualizations/ @elastic/kibana-app
3031

3132
# Application Services
32-
/examples/bfetch_explorer/ @elastic/kibana-app-arch
33-
/examples/dashboard_embeddable_examples/ @elastic/kibana-app-arch
34-
/examples/demo_search/ @elastic/kibana-app-arch
35-
/examples/developer_examples/ @elastic/kibana-app-arch
36-
/examples/embeddable_examples/ @elastic/kibana-app-arch
37-
/examples/embeddable_explorer/ @elastic/kibana-app-arch
38-
/examples/state_containers_examples/ @elastic/kibana-app-arch
39-
/examples/ui_action_examples/ @elastic/kibana-app-arch
40-
/examples/ui_actions_explorer/ @elastic/kibana-app-arch
41-
/examples/url_generators_examples/ @elastic/kibana-app-arch
42-
/examples/url_generators_explorer/ @elastic/kibana-app-arch
43-
/packages/elastic-datemath/ @elastic/kibana-app-arch
44-
/packages/kbn-interpreter/ @elastic/kibana-app-arch
45-
/src/plugins/bfetch/ @elastic/kibana-app-arch
46-
/src/plugins/data/ @elastic/kibana-app-arch
47-
/src/plugins/embeddable/ @elastic/kibana-app-arch
48-
/src/plugins/expressions/ @elastic/kibana-app-arch
49-
/src/plugins/inspector/ @elastic/kibana-app-arch
50-
/src/plugins/kibana_react/ @elastic/kibana-app-arch
33+
/examples/bfetch_explorer/ @elastic/kibana-app-services
34+
/examples/dashboard_embeddable_examples/ @elastic/kibana-app-services
35+
/examples/demo_search/ @elastic/kibana-app-services
36+
/examples/developer_examples/ @elastic/kibana-app-services
37+
/examples/embeddable_examples/ @elastic/kibana-app-services
38+
/examples/embeddable_explorer/ @elastic/kibana-app-services
39+
/examples/state_containers_examples/ @elastic/kibana-app-services
40+
/examples/ui_action_examples/ @elastic/kibana-app-services
41+
/examples/ui_actions_explorer/ @elastic/kibana-app-services
42+
/examples/url_generators_examples/ @elastic/kibana-app-services
43+
/examples/url_generators_explorer/ @elastic/kibana-app-services
44+
/packages/elastic-datemath/ @elastic/kibana-app-services
45+
/packages/kbn-interpreter/ @elastic/kibana-app-services
46+
/src/plugins/bfetch/ @elastic/kibana-app-services
47+
/src/plugins/data/ @elastic/kibana-app-services
48+
/src/plugins/embeddable/ @elastic/kibana-app-services
49+
/src/plugins/expressions/ @elastic/kibana-app-services
50+
/src/plugins/inspector/ @elastic/kibana-app-services
51+
/src/plugins/kibana_react/ @elastic/kibana-app-services
5152
/src/plugins/kibana_react/public/code_editor @elastic/kibana-presentation
52-
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
53-
/src/plugins/navigation/ @elastic/kibana-app-arch
54-
/src/plugins/share/ @elastic/kibana-app-arch
55-
/src/plugins/ui_actions/ @elastic/kibana-app-arch
56-
/x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-arch
57-
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-arch
58-
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-arch
59-
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-arch
60-
#CC# /src/plugins/bfetch/ @elastic/kibana-app-arch
61-
#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-arch
62-
#CC# /src/plugins/inspector/ @elastic/kibana-app-arch
63-
#CC# /src/plugins/share/ @elastic/kibana-app-arch
64-
#CC# /x-pack/plugins/drilldowns/ @elastic/kibana-app-arch
65-
#CC# /packages/kbn-interpreter/ @elastic/kibana-app-arch
53+
/src/plugins/kibana_utils/ @elastic/kibana-app-services
54+
/src/plugins/navigation/ @elastic/kibana-app-services
55+
/src/plugins/share/ @elastic/kibana-app-services
56+
/src/plugins/ui_actions/ @elastic/kibana-app-services
57+
/x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-services
58+
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-services
59+
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
60+
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
61+
#CC# /src/plugins/bfetch/ @elastic/kibana-app-services
62+
#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-services
63+
#CC# /src/plugins/inspector/ @elastic/kibana-app-services
64+
#CC# /src/plugins/share/ @elastic/kibana-app-services
65+
#CC# /x-pack/plugins/drilldowns/ @elastic/kibana-app-services
66+
#CC# /packages/kbn-interpreter/ @elastic/kibana-app-services
6667

6768
# APM
6869
/x-pack/plugins/apm/ @elastic/apm-ui
@@ -158,7 +159,7 @@
158159
/packages/kbn-ui-shared-deps/ @elastic/kibana-operations
159160
/packages/kbn-es-archiver/ @elastic/kibana-operations
160161
/packages/kbn-utils/ @elastic/kibana-operations
161-
/src/legacy/server/keystore/ @elastic/kibana-operations
162+
/src/cli/keystore/ @elastic/kibana-operations
162163
/src/legacy/server/warnings/ @elastic/kibana-operations
163164
/.ci/es-snapshots/ @elastic/kibana-operations
164165
/vars/ @elastic/kibana-operations
@@ -171,38 +172,38 @@
171172
/test/functional/services/lib @elastic/kibana-qa
172173
/test/functional/services/remote @elastic/kibana-qa
173174

174-
# Platform
175-
/src/core/ @elastic/kibana-platform
176-
/src/plugins/saved_objects_tagging_oss @elastic/kibana-platform
177-
/config/kibana.yml @elastic/kibana-platform
178-
/x-pack/plugins/features/ @elastic/kibana-platform
179-
/x-pack/plugins/licensing/ @elastic/kibana-platform
180-
/x-pack/plugins/global_search/ @elastic/kibana-platform
181-
/x-pack/plugins/cloud/ @elastic/kibana-platform
182-
/x-pack/plugins/saved_objects_tagging/ @elastic/kibana-platform
183-
/x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
184-
/x-pack/test/saved_object_tagging/ @elastic/kibana-platform
185-
/packages/kbn-config-schema/ @elastic/kibana-platform
186-
/packages/kbn-std/ @elastic/kibana-platform
187-
/src/legacy/server/config/ @elastic/kibana-platform
188-
/src/legacy/server/http/ @elastic/kibana-platform
189-
/src/legacy/server/logging/ @elastic/kibana-platform
190-
/src/plugins/status_page/ @elastic/kibana-platform
191-
/src/plugins/saved_objects_management/ @elastic/kibana-platform
192-
/src/dev/run_check_published_api_changes.ts @elastic/kibana-platform
193-
#CC# /src/core/server/csp/ @elastic/kibana-platform
194-
#CC# /src/legacy/server/config/ @elastic/kibana-platform
195-
#CC# /src/legacy/server/http/ @elastic/kibana-platform
196-
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-platform
197-
#CC# /src/plugins/legacy_export/ @elastic/kibana-platform
198-
#CC# /src/plugins/saved_objects/ @elastic/kibana-platform
199-
#CC# /src/plugins/status_page/ @elastic/kibana-platform
200-
#CC# /x-pack/plugins/cloud/ @elastic/kibana-platform
201-
#CC# /x-pack/plugins/features/ @elastic/kibana-platform
202-
#CC# /x-pack/plugins/global_search/ @elastic/kibana-platform
175+
# Core
176+
/src/core/ @elastic/kibana-core
177+
/src/plugins/saved_objects_tagging_oss @elastic/kibana-core
178+
/config/kibana.yml @elastic/kibana-core
179+
/x-pack/plugins/features/ @elastic/kibana-core
180+
/x-pack/plugins/licensing/ @elastic/kibana-core
181+
/x-pack/plugins/global_search/ @elastic/kibana-core
182+
/x-pack/plugins/cloud/ @elastic/kibana-core
183+
/x-pack/plugins/saved_objects_tagging/ @elastic/kibana-core
184+
/x-pack/test/saved_objects_field_count/ @elastic/kibana-core
185+
/x-pack/test/saved_object_tagging/ @elastic/kibana-core
186+
/packages/kbn-config-schema/ @elastic/kibana-core
187+
/packages/kbn-std/ @elastic/kibana-core
188+
/src/legacy/server/config/ @elastic/kibana-core
189+
/src/legacy/server/http/ @elastic/kibana-core
190+
/src/legacy/server/logging/ @elastic/kibana-core
191+
/src/plugins/status_page/ @elastic/kibana-core
192+
/src/plugins/saved_objects_management/ @elastic/kibana-core
193+
/src/dev/run_check_published_api_changes.ts @elastic/kibana-core
194+
#CC# /src/core/server/csp/ @elastic/kibana-core
195+
#CC# /src/legacy/server/config/ @elastic/kibana-core
196+
#CC# /src/legacy/server/http/ @elastic/kibana-core
197+
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-core
198+
#CC# /src/plugins/legacy_export/ @elastic/kibana-core
199+
#CC# /src/plugins/saved_objects/ @elastic/kibana-core
200+
#CC# /src/plugins/status_page/ @elastic/kibana-core
201+
#CC# /x-pack/plugins/cloud/ @elastic/kibana-core
202+
#CC# /x-pack/plugins/features/ @elastic/kibana-core
203+
#CC# /x-pack/plugins/global_search/ @elastic/kibana-core
203204

204205
# Security
205-
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
206+
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
206207
/src/plugins/security_oss/ @elastic/kibana-security
207208
/test/security_functional/ @elastic/kibana-security
208209
/x-pack/plugins/spaces/ @elastic/kibana-security

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.0
1+
12.19.1

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.0
1+
12.19.1

docs/developer/architecture/security/feature-registration.asciidoc

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,10 @@ server.route({
198198
=== Example 3: Discover
199199

200200
Discover takes advantage of subfeature privileges to allow fine-grained access control. In this example,
201-
a single "Create Short URLs" subfeature privilege is defined, which allows users to grant access to this feature without having to grant the `all` privilege to Discover. In other words, you can grant `read` access to Discover, and also grant the ability to create short URLs.
201+
two subfeature privileges are defined: "Create Short URLs", and "Generate PDF Reports". These allow users to grant access to this feature without having to grant the `all` privilege to Discover. In other words, you can grant `read` access to Discover, and also grant the ability to create short URLs or generate PDF reports.
202+
203+
Notice the "Generate PDF Reports" subfeature privilege has an additional `minimumPrivilege` option. Kibana will only offer this subfeature privilege if the
204+
license requirement is satisfied.
202205

203206
["source","javascript"]
204207
-----------
@@ -259,6 +262,28 @@ public setup(core, { features }) {
259262
},
260263
],
261264
},
265+
{
266+
groupType: 'independent',
267+
privileges: [
268+
{
269+
id: 'pdf_generate',
270+
name: i18n.translate(
271+
'xpack.features.ossFeatures.discoverGeneratePDFReportsPrivilegeName',
272+
{
273+
defaultMessage: 'Generate PDF Reports',
274+
}
275+
),
276+
minimumLicense: 'platinum',
277+
includeIn: 'all',
278+
savedObject: {
279+
all: [],
280+
read: [],
281+
},
282+
api: ['generatePDFReports'],
283+
ui: ['generatePDFReports'],
284+
},
285+
],
286+
},
262287
],
263288
},
264289
],

docs/developer/contributing/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
== Contributing
33

44
Whether you want to fix a bug, implement a feature, or add some other improvements or apis, the following sections will
5-
guide you on the process.
5+
guide you on the process. After committing your code, check out the link:https://www.elastic.co/community/contributor[Elastic Contributor Program] where you can earn points and rewards for your contributions.
66

77
Read <<development-getting-started>> to get your environment up and running, then read <<development-best-practices>>.
88

docs/developer/plugin-list.asciidoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,10 @@ Elastic.
479479
|Welcome to the Kibana rollup plugin! This plugin provides Kibana support for Elasticsearch's rollup feature. Please refer to the Elasticsearch documentation to understand rollup indices and how to create rollup jobs.
480480
481481
482+
|{kib-repo}blob/{branch}/x-pack/plugins/runtime_fields/README.md[runtimeFields]
483+
|Welcome to the home of the runtime field editor and everything related to runtime fields!
484+
485+
482486
|{kib-repo}blob/{branch}/x-pack/plugins/saved_objects_tagging/README.md[savedObjectsTagging]
483487
|Add tagging capability to saved objects
484488
@@ -554,6 +558,10 @@ in their infrastructure.
554558
|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
555559
556560
561+
|{kib-repo}blob/{branch}/x-pack/plugins/vis_type_timeseries_enhanced/README.md[visTypeTimeseriesEnhanced]
562+
|The vis_type_timeseries_enhanced plugin is the x-pack counterpart to the OSS vis_type_timeseries plugin.
563+
564+
557565
|{kib-repo}blob/{branch}/x-pack/plugins/watcher/README.md[watcher]
558566
|This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
559567

0 commit comments

Comments
 (0)