Skip to content

Commit fdd3893

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into xy-gap-settings
2 parents 87e1d5f + 354cd01 commit fdd3893

566 files changed

Lines changed: 12282 additions & 6259 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=16.13.2
4+
ARG NODE_VERSION=16.14.2
55

66
FROM node:${NODE_VERSION} AS base
77

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ npm-debug.log*
6969
.vagrant
7070
.envrc
7171

72+
## Snyk
73+
.dccache
74+
7275
## @cypress/snapshot from apm plugin
7376
/snapshots.js
7477

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.13.2
1+
16.14.2

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.13.2
1+
16.14.2

‎WORKSPACE.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ check_rules_nodejs_version(minimum_version_string = "4.0.0")
2727
# we can update that rule.
2828
node_repositories(
2929
node_repositories = {
30-
"16.13.2-darwin_amd64": ("node-v16.13.2-darwin-x64.tar.gz", "node-v16.13.2-darwin-x64", "900a952bb77533d349e738ff8a5179a4344802af694615f36320a888b49b07e6"),
31-
"16.13.2-darwin_arm64": ("node-v16.13.2-darwin-arm64.tar.gz", "node-v16.13.2-darwin-arm64", "09d300008ad58792c12622a5eafdb14c931587bb88713df4df64cdf4ff2188d1"),
32-
"16.13.2-linux_arm64": ("node-v16.13.2-linux-arm64.tar.xz", "node-v16.13.2-linux-arm64", "a3cf8e4e9fbea27573eee6da84720bf7227ddd22842b842d48049d6dfe55fb03"),
33-
"16.13.2-linux_s390x": ("node-v16.13.2-linux-s390x.tar.xz", "node-v16.13.2-linux-s390x", "c4ba46fc19366f7377d28a60a98f741bfa38045d7924306244c51d1660afcc8d"),
34-
"16.13.2-linux_amd64": ("node-v16.13.2-linux-x64.tar.xz", "node-v16.13.2-linux-x64", "7f5e9a42d6e86147867d35643c7b1680c27ccd45db85666fc52798ead5e74421"),
35-
"16.13.2-windows_amd64": ("node-v16.13.2-win-x64.zip", "node-v16.13.2-win-x64", "107e3ece84b7fa1e80b3bdf03181d395246c7867e27b17b6d7e6fa9c7932b467"),
30+
"16.14.2-darwin_amd64": ("node-v16.14.2-darwin-x64.tar.gz", "node-v16.14.2-darwin-x64", "d3076ca7fcc7269c8ff9b03fe7d1c277d913a7e84a46a14eff4af7791ff9d055"),
31+
"16.14.2-darwin_arm64": ("node-v16.14.2-darwin-arm64.tar.gz", "node-v16.14.2-darwin-arm64", "a66d9217d2003bd416d3dd06dfd2c7a044c4c9ff2e43a27865790bd0d59c682d"),
32+
"16.14.2-linux_arm64": ("node-v16.14.2-linux-arm64.tar.xz", "node-v16.14.2-linux-arm64", "f7c5a573c06a520d6c2318f6ae204141b8420386553a692fc359f8ae3d88df96"),
33+
"16.14.2-linux_s390x": ("node-v16.14.2-linux-s390x.tar.xz", "node-v16.14.2-linux-s390x", "3197925919ca357e17a31132dc6ef4e5afae819fa09905cfe9f7ff7924a00bf5"),
34+
"16.14.2-linux_amd64": ("node-v16.14.2-linux-x64.tar.xz", "node-v16.14.2-linux-x64", "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b"),
35+
"16.14.2-windows_amd64": ("node-v16.14.2-win-x64.zip", "node-v16.14.2-win-x64", "4731da4fbb2015d414e871fa9118cabb643bdb6dbdc8a69a3ed563266ac93229"),
3636
},
37-
node_version = "16.13.2",
37+
node_version = "16.14.2",
3838
node_urls = [
3939
"https://nodejs.org/dist/v{version}/{filename}",
4040
],

‎dev_docs/contributing/documentation.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ node scripts/docs.js --open
2424
## REST APIs
2525
REST APIs should be documented using the following formats:
2626

27-
- [API doc template](https://raw.githubusercontent.com/elastic/docs/main/shared/api-ref-ex.asciidoc)
28-
- [API object definition template](https://raw.githubusercontent.com/elastic/docs/main/shared/api-definitions-ex.asciidoc)
27+
- [API doc template](https://raw.githubusercontent.com/elastic/docs/master/shared/api-ref-ex.asciidoc)
28+
- [API object definition template](https://raw.githubusercontent.com/elastic/docs/master/shared/api-definitions-ex.asciidoc)
2929

3030
## Developer documentation
3131

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,12 +195,15 @@ For example, `20m`, `24h`, `7d`, `1w`. Default: `5m`.
195195
`xpack.alerting.cancelAlertsOnRuleTimeout`::
196196
Specifies whether to skip writing alerts and scheduling actions if rule execution is cancelled due to timeout. Default: `true`. This setting can be overridden by individual rule types.
197197

198-
`xpack.alerting.minimumScheduleInterval`::
199-
Specifies the minimum interval allowed for the all rules. This minimum is enforced for all rules created or updated after the introduction of this setting. The time is formatted as:
198+
`xpack.alerting.rules.minimumScheduleInterval.value`::
199+
Specifies the minimum schedule interval for rules. This minimum is applied to all rules created or updated after you set this value. The time is formatted as:
200200
+
201201
`<count>[s,m,h,d]`
202202
+
203203
For example, `20m`, `24h`, `7d`. Default: `1m`.
204204

205-
`xpack.alerting.rules.execution.actions.max`
206-
Specifies the maximum number of actions that a rule can trigger each time detection checks run.
205+
`xpack.alerting.rules.minimumScheduleInterval.enforce`::
206+
Specifies the behavior when a new or changed rule has a schedule interval less than the value defined in `xpack.alerting.rules.minimumScheduleInterval.value`. If `false`, rules with schedules less than the interval will be created but warnings will be logged. If `true`, rules with schedules less than the interval cannot be created. Default: `false`.
207+
208+
`xpack.alerting.rules.execution.actions.max`::
209+
Specifies the maximum number of actions that a rule can trigger each time detection checks run.

‎fleet_packages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"name": "elastic_agent",
22-
"version": "1.3.0"
22+
"version": "1.3.1"
2323
},
2424
{
2525
"name": "endpoint",

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@
6969
"url": "https://github.com/elastic/kibana.git"
7070
},
7171
"engines": {
72-
"node": "16.13.2",
72+
"node": "16.14.2",
7373
"yarn": "^1.21.1"
7474
},
7575
"resolutions": {
7676
"**/@babel/runtime": "^7.17.2",
77-
"**/@types/node": "16.10.2",
77+
"**/@types/node": "16.11.7",
7878
"**/chokidar": "^3.4.3",
7979
"**/deepmerge": "^4.2.2",
8080
"**/fast-deep-equal": "^3.1.1",
@@ -655,7 +655,7 @@
655655
"@types/mustache": "^0.8.31",
656656
"@types/ncp": "^2.0.1",
657657
"@types/nock": "^10.0.3",
658-
"@types/node": "16.10.2",
658+
"@types/node": "16.11.7",
659659
"@types/node-fetch": "^2.6.0",
660660
"@types/node-forge": "^1.0.1",
661661
"@types/nodemailer": "^6.4.0",

‎packages/kbn-alerts/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ ts_project(
7373
srcs = SRCS,
7474
deps = TYPES_DEPS,
7575
declaration = True,
76+
declaration_map = True,
7677
emit_declaration_only = True,
7778
out_dir = "target_types",
7879
root_dir = "src",

0 commit comments

Comments
 (0)