Skip to content

Commit e13bf88

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into resolver-multi-fields
2 parents 0660d81 + 4917df3 commit e13bf88

846 files changed

Lines changed: 19032 additions & 4735 deletions

File tree

Some content is hidden

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

‎.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: 2 additions & 1 deletion
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
@@ -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

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