Skip to content

Commit 33e7fba

Browse files
Merge branch 'master' into 83063-view-in-context-clipping
2 parents 017912f + 69e3ceb commit 33e7fba

File tree

2,230 files changed

+37975
-17562
lines changed

Some content is hidden

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

2,230 files changed

+37975
-17562
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=10.22.1
4+
ARG NODE_VERSION=12.19.1
55

66
FROM node:${NODE_VERSION} AS base
77

.ci/packer_cache_for_branch.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ node scripts/es snapshot --download-only;
1818
node scripts/es snapshot --license=oss --download-only;
1919

2020
# download reporting browsers
21-
(cd "x-pack" && yarn gulp downloadChromium);
21+
(cd "x-pack" && node ../node_modules/.bin/gulp downloadChromium);
2222

2323
# cache the chromedriver archive
2424
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
@@ -51,10 +51,6 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
5151
.chromedriver \
5252
.geckodriver;
5353

54-
echo "Adding node_modules"
55-
# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
56-
find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
57-
5854
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
5955

6056
if [[ "$branch" != "master" ]]; then

.eslintrc.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,12 +1035,19 @@ module.exports = {
10351035
* Alerting Services overrides
10361036
*/
10371037
{
1038-
// typescript only for front and back end
1038+
// typescript for front and back end
10391039
files: ['x-pack/plugins/{alerts,stack_alerts,actions,task_manager,event_log}/**/*.{ts,tsx}'],
10401040
rules: {
10411041
'@typescript-eslint/no-explicit-any': 'error',
10421042
},
10431043
},
1044+
{
1045+
// typescript only for back end
1046+
files: ['x-pack/plugins/triggers_actions_ui/server/**/*.ts'],
1047+
rules: {
1048+
'@typescript-eslint/no-explicit-any': 'error',
1049+
},
1050+
},
10441051

10451052
/**
10461053
* Lens overrides

.github/CODEOWNERS

Lines changed: 7 additions & 4 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
@@ -26,7 +27,7 @@
2627
/src/plugins/vis_type_vislib/ @elastic/kibana-app
2728
/src/plugins/vis_type_xy/ @elastic/kibana-app
2829
/src/plugins/visualize/ @elastic/kibana-app
29-
/src/plugins/visualizations/ @elastic/kibana-application
30+
/src/plugins/visualizations/ @elastic/kibana-app
3031

3132
# Application Services
3233
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -123,8 +124,8 @@
123124
# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
124125
/x-pack/plugins/transform/ @elastic/ml-ui
125126
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
126-
/x-pack/test/functional/services/transform/ @elastic/ml-ui/
127-
x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
127+
/x-pack/test/functional/services/transform/ @elastic/ml-ui
128+
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
128129
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
129130

130131
/x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui
@@ -137,6 +138,7 @@ x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
137138
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
138139
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
139140
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
141+
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
140142
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
141143
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
142144
#CC# /src/plugins/home/server/tutorials @elastic/kibana-gis
@@ -157,7 +159,7 @@ x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
157159
/packages/kbn-ui-shared-deps/ @elastic/kibana-operations
158160
/packages/kbn-es-archiver/ @elastic/kibana-operations
159161
/packages/kbn-utils/ @elastic/kibana-operations
160-
/src/legacy/server/keystore/ @elastic/kibana-operations
162+
/src/cli/keystore/ @elastic/kibana-operations
161163
/src/legacy/server/warnings/ @elastic/kibana-operations
162164
/.ci/es-snapshots/ @elastic/kibana-operations
163165
/vars/ @elastic/kibana-operations
@@ -261,6 +263,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
261263
# Elasticsearch UI
262264
/src/plugins/dev_tools/ @elastic/es-ui
263265
/src/plugins/console/ @elastic/es-ui
266+
/src/plugins/es_ui_shared/ @elastic/es-ui
264267
/x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
265268
/x-pack/plugins/index_lifecycle_management/ @elastic/es-ui
266269
/x-pack/plugins/console_extensions/ @elastic/es-ui

.github/paths-labeller.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
- "x-pack/plugins/apm/**/*.*"
1313
- "Team:Ingest Management":
1414
- "x-pack/plugins/fleet/**/*.*"
15-
- "x-pack/test/api_integration/apis/fleet/**/*.*"
16-
- "x-pack/test/epm_api_integration/**/*.*"
15+
- "x-pack/test/fleet_api_integration/**/*.*"
1716
- "Team:uptime":
1817
- "x-pack/plugins/uptime/**/*.*"
1918
- "x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/*.*"

.node-version

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

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.22.1
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)