Skip to content

Commit e20e416

Browse files
mshustovmshustov
committed
Merge branch 'master' into moar-migration-ts-projects
2 parents 8a39b2d + e8fea28 commit e20e416

325 files changed

Lines changed: 6718 additions & 4244 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/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ export declare class SearchInterceptor
2828
| --- | --- | --- |
2929
| [getTimeoutMode()](./kibana-plugin-plugins-data-public.searchinterceptor.gettimeoutmode.md) | | |
3030
| [handleSearchError(e, timeoutSignal, options)](./kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md) | | |
31-
| [search(request, options)](./kibana-plugin-plugins-data-public.searchinterceptor.search.md) | | Searches using the given <code>search</code> method. Overrides the <code>AbortSignal</code> with one that will abort either when <code>cancelPending</code> is called, when the request times out, or when the original <code>AbortSignal</code> is aborted. Updates <code>pendingCount$</code> when the request is started/finalized. |
31+
| [search(request, options)](./kibana-plugin-plugins-data-public.searchinterceptor.search.md) | | Searches using the given <code>search</code> method. Overrides the <code>AbortSignal</code> with one that will abort either when the request times out, or when the original <code>AbortSignal</code> is aborted. Updates <code>pendingCount$</code> when the request is started/finalized. |
3232
| [showError(e)](./kibana-plugin-plugins-data-public.searchinterceptor.showerror.md) | | |
3333

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.search.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## SearchInterceptor.search() method
66

7-
Searches using the given `search` method. Overrides the `AbortSignal` with one that will abort either when `cancelPending` is called, when the request times out, or when the original `AbortSignal` is aborted. Updates `pendingCount$` when the request is started/finalized.
7+
Searches using the given `search` method. Overrides the `AbortSignal` with one that will abort either when the request times out, or when the original `AbortSignal` is aborted. Updates `pendingCount$` when the request is started/finalized.
88

99
<b>Signature:</b>
1010

‎docs/setup/settings.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,3 +684,4 @@ include::secure-settings.asciidoc[]
684684
include::{kib-repo-dir}/settings/security-settings.asciidoc[]
685685
include::{kib-repo-dir}/settings/spaces-settings.asciidoc[]
686686
include::{kib-repo-dir}/settings/telemetry-settings.asciidoc[]
687+
include::{kib-repo-dir}/settings/task-manager-settings.asciidoc[]

‎docs/user/alerting/alerting-production-considerations.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Because by default tasks are polled at 3 second intervals and only 10 tasks can
2525
* Many alerts or actions must be *run at once*. In this case pending tasks will queue in {es}, and be pulled 10 at a time from the queue at 3 second intervals.
2626
* *Long running tasks* occupy slots for an extended time, leaving fewer slots for other tasks.
2727
28-
For details on the settings that can influence the performance and throughput of Task Manager, see {task-manager-settings}.
28+
For details on the settings that can influence the performance and throughput of Task Manager, see <<task-manager-settings,`Task Manager Settings`>>.
2929
3030
==============================================
3131

‎docs/user/dashboard/url-drilldown.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ internal {kib} navigations with carrying over current filters.
190190
| Current query string.
191191

192192
|
193-
| context.panel.query.lang
193+
| context.panel.query.language
194194
| Current query language.
195195

196196
|
@@ -200,8 +200,8 @@ context.panel.timeRange.to
200200
Tip: Use in combination with <<helpers, date>> helper to format date.
201201

202202
|
203-
| context.panel.timeRange.indexPatternId +
204-
context.panel.timeRange.indexPatternIds
203+
| context.panel.indexPatternId +
204+
context.panel.indexPatternIds
205205
|Index pattern ids used by a panel.
206206

207207
|

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48005,6 +48005,8 @@ __webpack_require__.r(__webpack_exports__);
4800548005
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelRepositoryCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["getBazelRepositoryCacheFolder"]; });
4800648006

4800748007
/* harmony import */ var _install_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(373);
48008+
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["isBazelBinAvailable"]; });
48009+
4800848010
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["installBazelTools"]; });
4800948011

4801048012
/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(374);
@@ -48064,6 +48066,7 @@ async function getBazelRepositoryCacheFolder() {
4806448066

4806548067
"use strict";
4806648068
__webpack_require__.r(__webpack_exports__);
48069+
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return isBazelBinAvailable; });
4806748070
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return installBazelTools; });
4806848071
/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
4806948072
/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
@@ -54434,8 +54437,10 @@ const CleanCommand = {
5443454437
} // Runs Bazel soft clean
5443554438

5443654439

54437-
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean']);
54438-
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Soft cleaned bazel');
54440+
if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["isBazelBinAvailable"])()) {
54441+
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean']);
54442+
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Soft cleaned bazel');
54443+
}
5443954444

5444054445
if (toDelete.length === 0) {
5444154446
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Nothing to delete');
@@ -59124,16 +59129,19 @@ const ResetCommand = {
5912459129
pattern: extraPatterns
5912559130
});
5912659131
}
59127-
} // Runs Bazel hard clean
59132+
} // Runs Bazel hard clean and deletes Bazel Cache Folders
5912859133

5912959134

59130-
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean', '--expunge']);
59131-
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Hard cleaned bazel'); // Deletes Bazel Cache Folders
59135+
if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["isBazelBinAvailable"])()) {
59136+
// Hard cleaning bazel
59137+
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean', '--expunge']);
59138+
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Hard cleaned bazel'); // Deletes Bazel Cache Folders
5913259139

59133-
await del__WEBPACK_IMPORTED_MODULE_1___default()([await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelDiskCacheFolder"])(), await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelRepositoryCacheFolder"])()], {
59134-
force: true
59135-
});
59136-
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Removed disk caches');
59140+
await del__WEBPACK_IMPORTED_MODULE_1___default()([await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelDiskCacheFolder"])(), await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelRepositoryCacheFolder"])()], {
59141+
force: true
59142+
});
59143+
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Removed disk caches');
59144+
}
5913759145

5913859146
if (toDelete.length === 0) {
5913959147
return;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import del from 'del';
1111
import ora from 'ora';
1212
import { join, relative } from 'path';
1313

14-
import { runBazel } from '../utils/bazel';
14+
import { isBazelBinAvailable, runBazel } from '../utils/bazel';
1515
import { isDirectory } from '../utils/fs';
1616
import { log } from '../utils/log';
1717
import { ICommand } from './';
@@ -53,8 +53,10 @@ export const CleanCommand: ICommand = {
5353
}
5454

5555
// Runs Bazel soft clean
56-
await runBazel(['clean']);
57-
log.success('Soft cleaned bazel');
56+
if (await isBazelBinAvailable()) {
57+
await runBazel(['clean']);
58+
log.success('Soft cleaned bazel');
59+
}
5860

5961
if (toDelete.length === 0) {
6062
log.success('Nothing to delete');

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ import del from 'del';
1111
import ora from 'ora';
1212
import { join, relative } from 'path';
1313

14-
import { getBazelDiskCacheFolder, getBazelRepositoryCacheFolder, runBazel } from '../utils/bazel';
14+
import {
15+
getBazelDiskCacheFolder,
16+
getBazelRepositoryCacheFolder,
17+
isBazelBinAvailable,
18+
runBazel,
19+
} from '../utils/bazel';
1520
import { isDirectory } from '../utils/fs';
1621
import { log } from '../utils/log';
1722
import { ICommand } from './';
@@ -52,15 +57,18 @@ export const ResetCommand: ICommand = {
5257
}
5358
}
5459

55-
// Runs Bazel hard clean
56-
await runBazel(['clean', '--expunge']);
57-
log.success('Hard cleaned bazel');
60+
// Runs Bazel hard clean and deletes Bazel Cache Folders
61+
if (await isBazelBinAvailable()) {
62+
// Hard cleaning bazel
63+
await runBazel(['clean', '--expunge']);
64+
log.success('Hard cleaned bazel');
5865

59-
// Deletes Bazel Cache Folders
60-
await del([await getBazelDiskCacheFolder(), await getBazelRepositoryCacheFolder()], {
61-
force: true,
62-
});
63-
log.success('Removed disk caches');
66+
// Deletes Bazel Cache Folders
67+
await del([await getBazelDiskCacheFolder(), await getBazelRepositoryCacheFolder()], {
68+
force: true,
69+
});
70+
log.success('Removed disk caches');
71+
}
6472

6573
if (toDelete.length === 0) {
6674
return;

‎packages/kbn-pm/src/utils/bazel/install_tools.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async function readBazelToolsVersionFile(repoRootPath: string, versionFilename:
2626
return version;
2727
}
2828

29-
async function isBazelBinAvailable() {
29+
export async function isBazelBinAvailable() {
3030
try {
3131
await spawn('bazel', ['--version'], { stdio: 'pipe' });
3232

‎src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ test('parses fully specified config', () => {
9999
"apiVersion": "v7.0.0",
100100
"hosts": Array [
101101
Object {
102-
"auth": "elastic:changeme",
103102
"headers": Object {
104103
"x-elastic-product-origin": "kibana",
105104
"xsrf": "something",
@@ -111,7 +110,6 @@ test('parses fully specified config', () => {
111110
"query": null,
112111
},
113112
Object {
114-
"auth": "elastic:changeme",
115113
"headers": Object {
116114
"x-elastic-product-origin": "kibana",
117115
"xsrf": "something",
@@ -123,7 +121,6 @@ test('parses fully specified config', () => {
123121
"query": null,
124122
},
125123
Object {
126-
"auth": "elastic:changeme",
127124
"headers": Object {
128125
"x-elastic-product-origin": "kibana",
129126
"xsrf": "something",
@@ -135,6 +132,7 @@ test('parses fully specified config', () => {
135132
"query": null,
136133
},
137134
],
135+
"httpAuth": "elastic:changeme",
138136
"keepAlive": true,
139137
"log": [Function],
140138
"pingTimeout": 12345,

0 commit comments

Comments
 (0)