Skip to content

Commit 2ac2646

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into controls/range-slider
2 parents fe291d1 + 310c1ba commit 2ac2646

448 files changed

Lines changed: 12564 additions & 7467 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.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
/src/plugins/chart_expressions/expression_heatmap/ @elastic/kibana-vis-editors
4242
/src/plugins/chart_expressions/expression_gauge/ @elastic/kibana-vis-editors
4343
/src/plugins/chart_expressions/expression_partition_vis/ @elastic/kibana-vis-editors
44+
/src/plugins/chart_expressions/expression_xy/ @elastic/kibana-vis-editors
4445
/src/plugins/url_forwarding/ @elastic/kibana-vis-editors
4546
/packages/kbn-tinymath/ @elastic/kibana-vis-editors
4647
/x-pack/test/functional/apps/lens @elastic/kibana-vis-editors

‎.i18nrc.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"expressionMetric": "src/plugins/expression_metric",
2727
"expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
2828
"expressionPartitionVis": "src/plugins/chart_expressions/expression_partition_vis",
29+
"expressionXY": "src/plugins/chart_expressions/expression_xy",
2930
"expressionRepeatImage": "src/plugins/expression_repeat_image",
3031
"expressionRevealImage": "src/plugins/expression_reveal_image",
3132
"expressions": "src/plugins/expressions",

‎WORKSPACE.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ yarn_install(
5858
data = [
5959
"//:.yarnrc",
6060
"//:preinstall_check.js",
61-
"//:node_modules/.yarn-integrity",
6261
],
6362
exports_directories_only = True,
6463
symlink_node_modules = True,

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ for use in their own application.
164164
|Expression Tagcloud plugin adds a tagcloud renderer and function to the expression plugin. The renderer will display the Wordcloud chart.
165165
166166
167+
|{kib-repo}blob/{branch}/src/plugins/chart_expressions/expression_xy/README.md[expressionXY]
168+
|Expression XY plugin adds a xy renderer and function to the expression plugin. The renderer will display the xy chart.
169+
170+
167171
|{kib-repo}blob/{branch}/src/plugins/field_formats/README.md[fieldFormats]
168172
|Index pattern fields formatters
169173

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,6 @@ For example, `20m`, `24h`, `7d`, `1w`. Default: `60s`.
185185
`xpack.alerting.maxEphemeralActionsPerAlert`::
186186
Sets the number of actions that will be executed ephemerally. To use this, enable ephemeral tasks in task manager first with <<task-manager-settings,`xpack.task_manager.ephemeral_tasks.enabled`>>
187187

188-
`xpack.alerting.defaultRuleTaskTimeout`::
189-
Specifies the default timeout for the all rule types tasks. The time is formatted as:
190-
+
191-
`<count>[ms,s,m,h,d,w,M,Y]`
192-
+
193-
For example, `20m`, `24h`, `7d`, `1w`. Default: `5m`.
194-
195188
`xpack.alerting.cancelAlertsOnRuleTimeout`::
196189
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.
197190

@@ -207,3 +200,22 @@ Specifies the behavior when a new or changed rule has a schedule interval less t
207200

208201
`xpack.alerting.rules.execution.actions.max`::
209202
Specifies the maximum number of actions that a rule can trigger each time detection checks run.
203+
204+
`xpack.alerting.rules.execution.timeout`::
205+
Specifies the default timeout for tasks associated with all types of rules. The time is formatted as:
206+
+
207+
`<count>[ms,s,m,h,d,w,M,Y]`
208+
+
209+
For example, `20m`, `24h`, `7d`, `1w`. Default: `5m`.
210+
211+
`xpack.alerting.rules.execution.ruleTypeOverrides`::
212+
Overrides the configs under `xpack.alerting.rules.execution` for the rule type with the given ID. List the rule identifier and its settings in an array of objects.
213+
+
214+
For example:
215+
```
216+
xpack.alerting.rules.execution:
217+
timeout: '5m'
218+
ruleTypeOverrides:
219+
- id: '.index-threshold'
220+
timeout: '15m'
221+
```

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
"usng.js": "^0.4.5",
419419
"utility-types": "^3.10.0",
420420
"uuid": "3.3.2",
421-
"vega": "^5.22.0",
421+
"vega": "^5.22.1",
422422
"vega-interpreter": "^1.0.4",
423423
"vega-lite": "^5.2.0",
424424
"vega-schema-url-parser": "^2.2.0",

‎packages/kbn-optimizer/limits.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,5 @@ pageLoadAssetSize:
124124
sessionView: 77750
125125
cloudSecurityPosture: 19109
126126
visTypeGauge: 24113
127+
expressionXY: 41392
127128
eventAnnotation: 19334

‎packages/kbn-pm/dist/index.js‎

Lines changed: 306 additions & 314 deletions
Large diffs are not rendered by default.

‎packages/kbn-pm/src/commands/bootstrap.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { readYarnLock } from '../utils/yarn_lock';
1818
import { sortPackageJson } from '../utils/sort_package_json';
1919
import { validateDependencies } from '../utils/validate_dependencies';
2020
import {
21-
ensureYarnIntegrityFileExists,
2221
installBazelTools,
22+
removeYarnIntegrityFileIfExists,
2323
runBazel,
2424
yarnIntegrityFileExists,
2525
} from '../utils/bazel';
@@ -54,17 +54,12 @@ export const BootstrapCommand: ICommand = {
5454
}
5555
};
5656

57-
// Force install is set in case a flag is passed or
58-
// if the `.yarn-integrity` file is not found which
59-
// will be indicated by the return of yarnIntegrityFileExists.
57+
// Force install is set in case a flag is passed into yarn kbn bootstrap or if the `.yarn-integrity`
58+
// file is not found which will be indicated by the return of yarnIntegrityFileExists.
6059
const forceInstall =
6160
(!!options && options['force-install'] === true) ||
6261
!(await yarnIntegrityFileExists(resolve(kibanaProjectPath, 'node_modules')));
6362

64-
// Ensure we have a `node_modules/.yarn-integrity` file as we depend on it
65-
// for bazel to know it has to re-install the node_modules after a reset or a clean
66-
await ensureYarnIntegrityFileExists(resolve(kibanaProjectPath, 'node_modules'));
67-
6863
// Install bazel machinery tools if needed
6964
await installBazelTools(rootPath);
7065

@@ -83,6 +78,8 @@ export const BootstrapCommand: ICommand = {
8378

8479
if (forceInstall) {
8580
await time('force install dependencies', async () => {
81+
await removeYarnIntegrityFileIfExists(resolve(kibanaProjectPath, 'node_modules'));
82+
await runBazel(['clean']);
8683
await runBazel(['run', '@nodejs//:yarn'], runOffline, {
8784
env: {
8885
SASS_BINARY_SITE:

‎packages/kbn-pm/src/commands/clean.ts‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { log } from '../utils/log';
1717
import { ICommand } from './';
1818

1919
export const CleanCommand: ICommand = {
20-
description: 'Deletes output directories, node_modules and resets internal caches.',
20+
description: 'Deletes output directories and resets internal caches.',
2121
name: 'clean',
2222

2323
reportTiming: {
@@ -27,20 +27,15 @@ export const CleanCommand: ICommand = {
2727

2828
async run(projects) {
2929
log.warning(dedent`
30-
This command is only necessary for the rare circumstance where you need to recover a consistent
30+
This command is only necessary for the circumstance where you need to recover a consistent
3131
state when problems arise. If you need to run this command often, please let us know by
32-
filling out this form: https://ela.st/yarn-kbn-clean
32+
filling out this form: https://ela.st/yarn-kbn-clean.
33+
Please not it might not solve problems with node_modules. To solve problems around node_modules
34+
you might need to run 'yarn kbn reset'.
3335
`);
3436

3537
const toDelete = [];
3638
for (const project of projects.values()) {
37-
if (await isDirectory(project.nodeModulesLocation)) {
38-
toDelete.push({
39-
cwd: project.path,
40-
pattern: relative(project.path, project.nodeModulesLocation),
41-
});
42-
}
43-
4439
if (await isDirectory(project.targetLocation)) {
4540
toDelete.push({
4641
cwd: project.path,

0 commit comments

Comments
 (0)