Skip to content

Commit 6f417e2

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into ingest_pipelines/painless_autocomplete
2 parents 2152ed8 + 9041ea5 commit 6f417e2

102 files changed

Lines changed: 1952 additions & 665 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.1
4+
ARG NODE_VERSION=14.15.1
55

66
FROM node:${NODE_VERSION} AS base
77

‎.node-version‎

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

‎.nvmrc‎

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

‎docs/api/using-api.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ For all APIs, you must use a request header. The {kib} APIs support the `kbn-xsr
6161
By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
6262

6363
* The API endpoint uses the `GET` or `HEAD` operations
64-
* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
64+
* The path is allowed using the <<settings-xsrf-allowlist, `server.xsrf.allowlist`>> setting
6565
* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
6666

6767
`Content-Type: application/json`::

‎docs/apm/api.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ users interacting with APM APIs must have <<apm-app-api-user,sufficient privileg
4040
By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
4141

4242
* The API endpoint uses the `GET` or `HEAD` operations
43-
* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
43+
* The path is allowed using the <<settings-xsrf-allowlist, `server.xsrf.allowlist`>> setting
4444
* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
4545

4646
`Content-Type: application/json`::

‎docs/setup/settings.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,10 +575,10 @@ all http requests to https over the port configured as <<server-port, `server.po
575575
| An array of supported protocols with versions.
576576
Valid protocols: `TLSv1`, `TLSv1.1`, `TLSv1.2`, `TLSv1.3`. *Default: TLSv1.1, TLSv1.2, TLSv1.3*
577577

578-
| [[settings-xsrf-whitelist]] `server.xsrf.whitelist:`
578+
| [[settings-xsrf-allowlist]] `server.xsrf.allowlist:`
579579
| It is not recommended to disable protections for
580580
arbitrary API endpoints. Instead, supply the `kbn-xsrf` header.
581-
The <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting requires the following format:
581+
The <<settings-xsrf-allowlist, `server.xsrf.allowlist`>> setting requires the following format:
582582

583583
|===
584584

‎package.json‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"**/@types/hapi__boom": "^7.4.1",
8282
"**/@types/hapi__hapi": "^18.2.6",
8383
"**/@types/hapi__mimos": "4.1.0",
84-
"**/@types/node": "12.19.4",
84+
"**/@types/node": "14.14.7",
8585
"**/cross-fetch/node-fetch": "^2.6.1",
8686
"**/deepmerge": "^4.2.2",
8787
"**/fast-deep-equal": "^3.1.1",
@@ -98,7 +98,7 @@
9898
"**/typescript": "4.1.2"
9999
},
100100
"engines": {
101-
"node": "12.19.1",
101+
"node": "14.15.1",
102102
"yarn": "^1.21.1"
103103
},
104104
"dependencies": {
@@ -109,7 +109,7 @@
109109
"@elastic/ems-client": "7.11.0",
110110
"@elastic/eui": "30.2.0",
111111
"@elastic/filesaver": "1.1.2",
112-
"@elastic/good": "8.1.1-kibana2",
112+
"@elastic/good": "^9.0.1-kibana3",
113113
"@elastic/node-crypto": "1.2.1",
114114
"@elastic/numeral": "^2.5.0",
115115
"@elastic/request-crypto": "1.1.4",
@@ -496,7 +496,7 @@
496496
"@types/mustache": "^0.8.31",
497497
"@types/ncp": "^2.0.1",
498498
"@types/nock": "^10.0.3",
499-
"@types/node": "12.19.4",
499+
"@types/node": "14.14.7",
500500
"@types/node-fetch": "^2.5.7",
501501
"@types/node-forge": "^0.9.5",
502502
"@types/nodemailer": "^6.4.0",
@@ -525,7 +525,6 @@
525525
"@types/react-resize-detector": "^4.0.1",
526526
"@types/react-router": "^5.1.7",
527527
"@types/react-router-dom": "^5.1.5",
528-
"@types/react-sticky": "^6.0.3",
529528
"@types/react-test-renderer": "^16.9.1",
530529
"@types/react-virtualized": "^9.18.7",
531530
"@types/read-pkg": "^4.0.0",
@@ -722,7 +721,7 @@
722721
"less": "npm:@elastic/less@2.7.3-kibana",
723722
"license-checker": "^16.0.0",
724723
"listr": "^0.14.1",
725-
"lmdb-store": "^0.8.15",
724+
"lmdb-store": "^0.9.0",
726725
"load-grunt-config": "^3.0.1",
727726
"loader-utils": "^1.2.3",
728727
"log-symbols": "^2.2.0",
@@ -782,7 +781,6 @@
782781
"react-router-redux": "^4.0.8",
783782
"react-shortcuts": "^2.0.0",
784783
"react-sizeme": "^2.3.6",
785-
"react-sticky": "^6.0.3",
786784
"react-syntax-highlighter": "^5.7.0",
787785
"react-test-renderer": "^16.12.0",
788786
"react-tiny-virtual-list": "^2.2.0",
@@ -805,7 +803,7 @@
805803
"sass-resources-loader": "^2.0.1",
806804
"selenium-webdriver": "^4.0.0-alpha.7",
807805
"serve-static": "1.14.1",
808-
"shelljs": "^0.8.3",
806+
"shelljs": "^0.8.4",
809807
"simple-git": "1.116.0",
810808
"sinon": "^7.4.2",
811809
"spawn-sync": "^1.0.15",

‎packages/kbn-config/src/legacy/__snapshots__/legacy_object_to_config_adapter.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/kbn-config/src/legacy/legacy_object_to_config_adapter.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ describe('#get', () => {
9696
someNotSupportedValue: 'val',
9797
xsrf: {
9898
disableProtection: false,
99-
whitelist: [],
99+
allowlist: [],
100100
},
101101
},
102102
});
@@ -119,7 +119,7 @@ describe('#get', () => {
119119
someNotSupportedValue: 'val',
120120
xsrf: {
121121
disableProtection: false,
122-
whitelist: [],
122+
allowlist: [],
123123
},
124124
},
125125
});

‎packages/kbn-legacy-logging/src/legacy_logging_server.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,18 @@ export class LegacyLoggingServer {
117117
public log({ level, context, message, error, timestamp, meta = {} }: LogRecord) {
118118
const { tags = [], ...metadata } = meta;
119119

120-
this.events.emit('log', {
121-
data: getDataToLog(error, metadata, message),
122-
tags: [getLegacyLogLevel(level), ...context.split('.'), ...tags],
123-
timestamp: timestamp.getTime(),
124-
});
120+
this.events
121+
.emit('log', {
122+
data: getDataToLog(error, metadata, message),
123+
tags: [getLegacyLogLevel(level), ...context.split('.'), ...tags],
124+
timestamp: timestamp.getTime(),
125+
})
126+
// @ts-expect-error @hapi/podium emit is actually an async function
127+
.catch((err) => {
128+
// eslint-disable-next-line no-console
129+
console.error('An unexpected error occurred while writing to the log:', err.stack);
130+
process.exit(1);
131+
});
125132
}
126133

127134
public stop() {

0 commit comments

Comments
 (0)