Skip to content

Commit fc4fa5c

Browse files
author
Stacey Gammon
committed
Merge branch 'master' of https://github.com/elastic/kibana into 2021-05-27-fix-no-comments-arrow-fns
2 parents 0fd5a25 + b575a45 commit fc4fa5c

212 files changed

Lines changed: 11017 additions & 4824 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.

‎docs/developer/getting-started/monorepo-packages.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ yarn kbn watch-bazel
8080
- @kbn/eslint-plugin-eslint
8181
- @kbn/expect
8282
- @kbn/i18n
83+
- @kbn/io-ts-utils
8384
- @kbn/legacy-logging
8485
- @kbn/logging
8586
- @kbn/mapbox-gl

‎docs/settings/alert-action-settings.asciidoc‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can configure the following settings in the `kibana.yml` file.
4141
[cols="2*<"]
4242
|===
4343
| `xpack.actions.enabled`
44-
| Feature toggle that enables Actions in {kib}. Defaults to `true`.
44+
| Feature toggle that enables Actions in {kib}. Default: `true`.
4545

4646
| `xpack.actions.allowedHosts` {ess-icon}
4747
| A list of hostnames that {kib} is allowed to connect to when built-in actions are triggered. It defaults to `[*]`, allowing any host, but keep in mind the potential for SSRF attacks when hosts are not explicitly added to the allowed hosts. An empty list `[]` can be used to block built-in actions from making any external connections. +
@@ -50,7 +50,7 @@ You can configure the following settings in the `kibana.yml` file.
5050

5151
| `xpack.actions.customHostSettings` {ess-icon}
5252
| A list of custom host settings to override existing global settings.
53-
Defaults to an empty list. +
53+
Default: an empty list. +
5454
+
5555
Each entry in the list must have a `url` property, to associate a connection
5656
type (mail or https), hostname and port with the remaining options in the
@@ -70,6 +70,7 @@ You can configure the following settings in the `kibana.yml` file.
7070
xpack.actions.customHostSettings:
7171
- url: smtp://mail.example.com:465
7272
tls:
73+
verificationMode: 'full'
7374
certificateAuthoritiesFiles: [ 'one.crt' ]
7475
certificateAuthoritiesData: |
7576
-----BEGIN CERTIFICATE-----
@@ -79,7 +80,9 @@ xpack.actions.customHostSettings:
7980
requireTLS: true
8081
- url: https://webhook.example.com
8182
tls:
83+
// legacy
8284
rejectUnauthorized: false
85+
verificationMode: 'none'
8386
--
8487

8588
[cols="2*<"]
@@ -115,10 +118,16 @@ xpack.actions.customHostSettings:
115118

116119
| `xpack.actions.customHostSettings[n]`
117120
`.tls.rejectUnauthorized` {ess-icon}
118-
| A boolean value indicating whether to bypass server certificate validation.
121+
| Deprecated. Use <<action-config-custom-host-verification-mode,`xpack.actions.customHostSettings.tls.verificationMode`>> instead. A boolean value indicating whether to bypass server certificate validation.
119122
Overrides the general `xpack.actions.rejectUnauthorized` configuration
120123
for requests made for this hostname/port.
121124

125+
|[[action-config-custom-host-verification-mode]] `xpack.actions.customHostSettings[n]`
126+
`.tls.verificationMode`
127+
| Controls the verification of the server certificate that {hosted-ems} receives when making an outbound SSL/TLS connection to the host server. Valid values are `full`, `certificate`, and `none`.
128+
Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>. Overrides the general `xpack.actions.tls.verificationMode` configuration
129+
for requests made for this hostname/port.
130+
122131
| `xpack.actions.customHostSettings[n]`
123132
`.tls.certificateAuthoritiesFiles`
124133
| A file name or list of file names of PEM-encoded certificate files to use
@@ -137,10 +146,10 @@ xpack.actions.customHostSettings:
137146

138147
| `xpack.actions`
139148
`.preconfiguredAlertHistoryEsIndex` {ess-icon}
140-
| Enables a preconfigured alert history {es} <<index-action-type, Index>> connector. Defaults to `false`.
149+
| Enables a preconfigured alert history {es} <<index-action-type, Index>> connector. Default: `false`.
141150

142151
| `xpack.actions.preconfigured`
143-
| Specifies preconfigured connector IDs and configs. Defaults to {}.
152+
| Specifies preconfigured connector IDs and configs. Default: {}.
144153

145154
| `xpack.actions.proxyUrl` {ess-icon}
146155
| Specifies the proxy URL to use, if using a proxy for actions. By default, no proxy is used.
@@ -152,27 +161,44 @@ xpack.actions.customHostSettings:
152161
| Specifies hostnames which should only use the proxy, if using a proxy for actions. The value is an array of hostnames as strings. By default, no hosts will use the proxy, but if an action's hostname is in this list, the proxy will be used. The settings `xpack.actions.proxyBypassHosts` and `xpack.actions.proxyOnlyHosts` cannot be used at the same time.
153162

154163
| `xpack.actions.proxyHeaders` {ess-icon}
155-
| Specifies HTTP headers for the proxy, if using a proxy for actions. Defaults to {}.
164+
| Specifies HTTP headers for the proxy, if using a proxy for actions. Default: {}.
156165

157166
a|`xpack.actions.`
158167
`proxyRejectUnauthorizedCertificates` {ess-icon}
159-
| Set to `false` to bypass certificate validation for the proxy, if using a proxy for actions. Defaults to `true`.
168+
| Deprecated. Use <<action-config-proxy-verification-mode,`xpack.actions.tls.proxyVerificationMode`>> instead. Set to `false` to bypass certificate validation for the proxy, if using a proxy for actions. Default: `true`.
169+
170+
|[[action-config-proxy-verification-mode]]
171+
`xpack.actions[n]`
172+
`.tls.proxyVerificationMode` {ess-icon}
173+
| Controls the verification for the proxy server certificate that {hosted-ems} receives when making an outbound SSL/TLS connection to the proxy server. Valid values are `full`, `certificate`, and `none`.
174+
Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>.
160175

161176
| `xpack.actions.rejectUnauthorized` {ess-icon}
162-
| Set to `false` to bypass certificate validation for actions. Defaults to `true`. +
177+
| Deprecated. Use <<action-config-verification-mode,`xpack.actions.tls.verificationMode`>> instead. Set to `false` to bypass certificate validation for actions. Default: `true`. +
163178
+
164179
As an alternative to setting `xpack.actions.rejectUnauthorized`, you can use the setting
165180
`xpack.actions.customHostSettings` to set TLS options for specific servers.
166181

182+
|[[action-config-verification-mode]]
183+
`xpack.actions[n]`
184+
`.tls.verificationMode` {ess-icon}
185+
| Controls the verification for the server certificate that {hosted-ems} receives when making an outbound SSL/TLS connection for actions. Valid values are `full`, `certificate`, and `none`.
186+
Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>. +
187+
+
188+
As an alternative to setting `xpack.actions.tls.verificationMode`, you can use the setting
189+
`xpack.actions.customHostSettings` to set TLS options for specific servers.
190+
191+
192+
167193
| `xpack.actions.maxResponseContentLength` {ess-icon}
168-
| Specifies the max number of bytes of the http response for requests to external resources. Defaults to 1000000 (1MB).
194+
| Specifies the max number of bytes of the http response for requests to external resources. Default: 1000000 (1MB).
169195

170196
| `xpack.actions.responseTimeout` {ess-icon}
171197
| Specifies the time allowed for requests to external resources. Requests that take longer are aborted. The time is formatted as: +
172198
+
173199
`<count>[ms,s,m,h,d,w,M,Y]` +
174200
+
175-
For example, `20m`, `24h`, `7d`, `1w`. Defaults to `60s`.
201+
For example, `20m`, `24h`, `7d`, `1w`. Default: `60s`.
176202

177203

178204
|===

‎docs/user/alerting/rule-management.asciidoc‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,6 @@ These operations can also be performed in bulk by multi-selecting rules and clic
5757
[role="screenshot"]
5858
image:images/bulk-mute-disable.png[The Manage rules button lets you mute/unmute, enable/disable, and delete in bulk]
5959

60-
[float]
61-
[[importing-and-exporting-rules]]
62-
=== Importing and exporting rules
63-
64-
To import and export rules, use the <<managing-saved-objects, Saved Objects Management UI>>.
65-
After the succesful import the proper banner will be displayed:
66-
[role="screenshot"]
67-
image::images/rules-imported-banner.png[Rules import banner, width=50%]
68-
6960
[float]
7061
=== Required permissions
7162

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module",
134134
"@kbn/i18n": "link:bazel-bin/packages/kbn-i18n/npm_module",
135135
"@kbn/interpreter": "link:packages/kbn-interpreter",
136-
"@kbn/io-ts-utils": "link:packages/kbn-io-ts-utils",
136+
"@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils/npm_module",
137137
"@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging/npm_module",
138138
"@kbn/logging": "link:bazel-bin/packages/kbn-logging/npm_module",
139139
"@kbn/monaco": "link:bazel-bin/packages/kbn-monaco/npm_module",
@@ -161,6 +161,7 @@
161161
"@mapbox/mapbox-gl-draw": "1.3.0",
162162
"@mapbox/mapbox-gl-rtl-text": "0.2.3",
163163
"@mapbox/vector-tile": "1.3.1",
164+
"@reduxjs/toolkit": "^1.5.1",
164165
"@scant/router": "^0.1.1",
165166
"@slack/webhook": "^5.0.4",
166167
"@turf/along": "6.0.1",
@@ -173,6 +174,7 @@
173174
"@turf/distance": "6.0.1",
174175
"@turf/helpers": "6.0.1",
175176
"@turf/length": "^6.0.2",
177+
"@types/redux-logger": "^3.0.8",
176178
"JSONStream": "1.3.5",
177179
"abort-controller": "^3.0.0",
178180
"abortcontroller-polyfill": "^1.4.0",
@@ -365,6 +367,7 @@
365367
"redux": "^4.0.5",
366368
"redux-actions": "^2.6.5",
367369
"redux-devtools-extension": "^2.13.8",
370+
"redux-logger": "^3.0.6",
368371
"redux-observable": "^1.2.0",
369372
"redux-saga": "^1.1.3",
370373
"redux-thunk": "^2.3.0",

‎packages/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ filegroup(
2222
"//packages/kbn-eslint-plugin-eslint:build",
2323
"//packages/kbn-expect:build",
2424
"//packages/kbn-i18n:build",
25+
"//packages/kbn-io-ts-utils:build",
2526
"//packages/kbn-legacy-logging:build",
2627
"//packages/kbn-logging:build",
2728
"//packages/kbn-mapbox-gl:build",

‎packages/kbn-io-ts-utils/BUILD.bazel‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
2+
load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
3+
4+
PKG_BASE_NAME = "kbn-io-ts-utils"
5+
PKG_REQUIRE_NAME = "@kbn/io-ts-utils"
6+
7+
SOURCE_FILES = glob(
8+
[
9+
"src/**/*.ts",
10+
],
11+
exclude = [
12+
"**/*.test.*"
13+
],
14+
)
15+
16+
SRCS = SOURCE_FILES
17+
18+
filegroup(
19+
name = "srcs",
20+
srcs = SRCS,
21+
)
22+
23+
NPM_MODULE_EXTRA_FILES = [
24+
"package.json",
25+
]
26+
27+
SRC_DEPS = [
28+
"@npm//fp-ts",
29+
"@npm//io-ts",
30+
"@npm//lodash",
31+
"@npm//tslib",
32+
]
33+
34+
TYPES_DEPS = [
35+
"@npm//@types/jest",
36+
"@npm//@types/lodash",
37+
"@npm//@types/node",
38+
]
39+
40+
DEPS = SRC_DEPS + TYPES_DEPS
41+
42+
ts_config(
43+
name = "tsconfig",
44+
src = "tsconfig.json",
45+
deps = [
46+
"//:tsconfig.base.json",
47+
],
48+
)
49+
50+
ts_project(
51+
name = "tsc",
52+
args = ['--pretty'],
53+
srcs = SRCS,
54+
deps = DEPS,
55+
declaration = True,
56+
declaration_map = True,
57+
incremental = True,
58+
out_dir = "target",
59+
source_map = True,
60+
root_dir = "src",
61+
tsconfig = ":tsconfig",
62+
)
63+
64+
js_library(
65+
name = PKG_BASE_NAME,
66+
srcs = NPM_MODULE_EXTRA_FILES,
67+
deps = DEPS + [":tsc"],
68+
package_name = PKG_REQUIRE_NAME,
69+
visibility = ["//visibility:public"],
70+
)
71+
72+
pkg_npm(
73+
name = "npm_module",
74+
deps = [
75+
":%s" % PKG_BASE_NAME,
76+
]
77+
)
78+
79+
filegroup(
80+
name = "build",
81+
srcs = [
82+
":npm_module",
83+
],
84+
visibility = ["//visibility:public"],
85+
)

‎packages/kbn-io-ts-utils/package.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,5 @@
44
"types": "./target/index.d.ts",
55
"version": "1.0.0",
66
"license": "SSPL-1.0 OR Elastic License 2.0",
7-
"private": true,
8-
"scripts": {
9-
"build": "../../node_modules/.bin/tsc",
10-
"kbn:bootstrap": "yarn build",
11-
"kbn:watch": "yarn build --watch"
12-
}
7+
"private": true
138
}

‎packages/kbn-io-ts-utils/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"incremental": false,
4+
"incremental": true,
55
"outDir": "./target",
66
"stripInternal": false,
77
"declaration": true,

‎packages/kbn-server-route-repository/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,5 @@
99
"build": "../../node_modules/.bin/tsc",
1010
"kbn:bootstrap": "yarn build",
1111
"kbn:watch": "yarn build --watch"
12-
},
13-
"dependencies": {
14-
"@kbn/io-ts-utils": "link:../kbn-io-ts-utils"
1512
}
1613
}

‎src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ kibana_vars=(
175175
xpack.actions.rejectUnauthorized
176176
xpack.actions.maxResponseContentLength
177177
xpack.actions.responseTimeout
178+
xpack.actions.tls.verificationMode
179+
xpack.actions.tls.proxyVerificationMode
178180
xpack.alerts.healthCheck.interval
179181
xpack.alerts.invalidateApiKeysTask.interval
180182
xpack.alerts.invalidateApiKeysTask.removalDelay

0 commit comments

Comments
 (0)