Skip to content

Commit e4bbb34

Browse files
Merge branch 'master' of github.com:elastic/kibana into maps/tracktileloadstatus
2 parents 47752e3 + 462fe08 commit e4bbb34

File tree

33 files changed

+475
-359
lines changed

33 files changed

+475
-359
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,7 @@ module.exports = {
13641364
'no-restricted-imports': [
13651365
'error',
13661366
{
1367-
patterns: ['lodash/*', '!lodash/fp'],
1367+
patterns: ['lodash/*', '!lodash/fp', 'rxjs/internal-compatibility'],
13681368
},
13691369
],
13701370
},

api_docs/data.json

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

api_docs/data_search.json

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

docs/settings/task-manager-settings.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ Task Manager runs background tasks by polling for work on an interval. You can
2727

2828
| `xpack.task_manager.max_workers`
2929
| The maximum number of tasks that this Kibana instance will run simultaneously. Defaults to 10.
30-
30+
Starting in 8.0, it will not be possible to set the value greater than 100.
3131

3232
|===

docs/user/alerting/defining-alerts.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ Some cases exist where the variable values will be "escaped", when used in a con
9595

9696
Mustache also supports "triple braces" of the form `{{{variable name}}}`, which indicates no escaping should be done at all. Care should be used when using this form, as it could end up rendering the variable content in such a way as to make the resulting parameter invalid or formatted incorrectly.
9797

98+
Each alert type defines additional variables as properties of the variable `context`. For example, if an alert type defines a variable `value`, it can be used in an action parameter as `{{context.value}}`.
99+
100+
For diagnostic or exploratory purposes, action variables whose values are objects, such as `context`, can be referenced directly as variables. The resulting value will be a JSON representation of the object. For example, if an action parameter includes `{{context}}`, it will expand to the JSON representation of all the variables and values provided by the alert type.
101+
98102
You can attach more than one action. Clicking the "Add action" button will prompt you to select another alert type and repeat the above steps again.
99103

100104
[role="screenshot"]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"**/load-grunt-config/lodash": "^4.17.21",
8383
"**/minimist": "^1.2.5",
8484
"**/node-jose/node-forge": "^0.10.0",
85-
"**/prismjs": "1.22.0",
85+
"**/prismjs": "1.23.0",
8686
"**/react-syntax-highlighter": "^15.3.1",
8787
"**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
8888
"**/request": "^2.88.2",

packages/kbn-optimizer/limits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pageLoadAssetSize:
1414
dashboard: 374194
1515
dashboardEnhanced: 65646
1616
dashboardMode: 22716
17-
data: 1319839
17+
data: 900000
1818
dataEnhanced: 50420
1919
devTools: 38637
2020
discover: 105145

src/dev/bazel_workspace_status.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,43 +17,47 @@
1717
// If the script exits with non-zero code, it's considered as a failure
1818
// and the output will be discarded.
1919

20-
(async () => {
21-
const execa = require('execa');
20+
(() => {
21+
const cp = require('child_process');
2222
const os = require('os');
2323

24-
async function runCmd(cmd, args) {
24+
function runCmd(cmd, args) {
2525
try {
26-
return await execa(cmd, args);
26+
const spawnResult = cp.spawnSync(cmd, args);
27+
const exitCode = spawnResult.status !== null ? spawnResult.status : 1;
28+
const stdoutStr = spawnResult.stdout.toString();
29+
const stdout = stdoutStr ? stdoutStr.trim() : null;
30+
31+
return {
32+
exitCode,
33+
stdout,
34+
};
2735
} catch (e) {
2836
return { exitCode: 1 };
2937
}
3038
}
3139

3240
// Git repo
3341
const kbnGitOriginName = process.env.KBN_GIT_ORIGIN_NAME || 'origin';
34-
const repoUrlCmdResult = await runCmd('git', [
35-
'config',
36-
'--get',
37-
`remote.${kbnGitOriginName}.url`,
38-
]);
42+
const repoUrlCmdResult = runCmd('git', ['config', '--get', `remote.${kbnGitOriginName}.url`]);
3943
if (repoUrlCmdResult.exitCode === 0) {
4044
// Only output REPO_URL when found it
4145
console.log(`REPO_URL ${repoUrlCmdResult.stdout}`);
4246
}
4347

4448
// Commit SHA
45-
const commitSHACmdResult = await runCmd('git', ['rev-parse', 'HEAD']);
49+
const commitSHACmdResult = runCmd('git', ['rev-parse', 'HEAD']);
4650
if (commitSHACmdResult.exitCode === 0) {
4751
console.log(`COMMIT_SHA ${commitSHACmdResult.stdout}`);
4852

4953
// Branch
50-
const gitBranchCmdResult = await runCmd('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
54+
const gitBranchCmdResult = runCmd('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
5155
if (gitBranchCmdResult.exitCode === 0) {
5256
console.log(`GIT_BRANCH ${gitBranchCmdResult.stdout}`);
5357
}
5458

5559
// Tree status
56-
const treeStatusCmdResult = await runCmd('git', ['diff-index', '--quiet', 'HEAD', '--']);
60+
const treeStatusCmdResult = runCmd('git', ['diff-index', '--quiet', 'HEAD', '--']);
5761
const treeStatusVarStr = 'GIT_TREE_STATUS';
5862
if (treeStatusCmdResult.exitCode === 0) {
5963
console.log(`${treeStatusVarStr} Clean`);
@@ -64,7 +68,7 @@
6468

6569
// Host
6670
if (process.env.CI) {
67-
const hostCmdResult = await runCmd('hostname');
71+
const hostCmdResult = runCmd('hostname');
6872
const hostStr = hostCmdResult.stdout.split('-').slice(0, -1).join('-');
6973
const coresStr = os.cpus().filter((cpu, index) => {
7074
return !cpu.model.includes('Intel') || index % 2 === 1;

src/dev/typescript/build_ts_refs_cli.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ const isTypeFailure = (error: any) =>
2929
export async function runBuildRefsCli() {
3030
run(
3131
async ({ log, flags }) => {
32+
if (process.env.BUILD_TS_REFS_DISABLE === 'true' && !flags.force) {
33+
log.info(
34+
'Building ts refs is disabled because the BUILD_TS_REFS_DISABLE environment variable is set to "true". Pass `--force` to run the build anyway.'
35+
);
36+
return;
37+
}
38+
3239
const outDirs = getOutputsDeep(REF_CONFIG_PATHS);
3340

3441
const cacheEnabled = process.env.BUILD_TS_REFS_CACHE_ENABLE !== 'false' && !!flags.cache;
@@ -82,11 +89,12 @@ export async function runBuildRefsCli() {
8289
{
8390
description: 'Build TypeScript projects',
8491
flags: {
85-
boolean: ['clean', 'cache', 'ignore-type-failures'],
92+
boolean: ['clean', 'force', 'cache', 'ignore-type-failures'],
8693
default: {
8794
cache: true,
8895
},
8996
help: `
97+
--force Run the build even if the BUILD_TS_REFS_DISABLE is set to "true"
9098
--clean Delete outDirs for each ts project before building
9199
--no-cache Disable fetching/extracting outDir caches based on the mergeBase with upstream
92100
--ignore-type-failures If tsc reports type errors, ignore them and just log a small warning.

src/plugins/data/common/search/search_source/search_source.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@
5959
*/
6060

6161
import { setWith } from '@elastic/safer-lodash-set';
62-
import { uniqueId, keyBy, pick, difference, isFunction, isEqual, uniqWith } from 'lodash';
62+
import { uniqueId, keyBy, pick, difference, isFunction, isEqual, uniqWith, isObject } from 'lodash';
6363
import { map, switchMap, tap } from 'rxjs/operators';
6464
import { defer, from } from 'rxjs';
65-
import { isObject } from 'rxjs/internal-compatibility';
6665
import { normalizeSortRequest } from './normalize_sort_request';
6766
import { fieldWildcardFilter } from '../../../../kibana_utils/common';
6867
import { IIndexPattern, IndexPattern, IndexPatternField } from '../../index_patterns';

0 commit comments

Comments
 (0)