Skip to content

Commit 7c744fa

Browse files
Merge branch 'master' into feat/siem-untitled-timeline
2 parents 64581f7 + cbe5597 commit 7c744fa

File tree

119 files changed

+12752
-11794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+12752
-11794
lines changed

.backportrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
],
2626
"targetPRLabels": ["backport"],
2727
"branchLabelMapping": {
28-
"^v7.8.0$": "7.x",
28+
"^v7.9.0$": "7.x",
2929
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
3030
}
3131
}

docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
fields?: {
1111
[subfield: string]: {
1212
type: string;
13+
ignore_above?: number;
1314
};
1415
};
1516
```

docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface SavedObjectsCoreFieldMapping
1717
| Property | Type | Description |
1818
| --- | --- | --- |
1919
| [enabled](./kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md) | <code>boolean</code> | |
20-
| [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code> [subfield: string]: {</code><br/><code> type: string;</code><br/><code> };</code><br/><code> }</code> | |
20+
| [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code> [subfield: string]: {</code><br/><code> type: string;</code><br/><code> ignore_above?: number;</code><br/><code> };</code><br/><code> }</code> | |
2121
| [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | <code>boolean</code> | |
2222
| [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | <code>number &#124; boolean &#124; string</code> | |
2323
| [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | <code>string</code> | |
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsMigrationLogger](./kibana-plugin-core-server.savedobjectsmigrationlogger.md) &gt; [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md)
4+
5+
## SavedObjectsMigrationLogger.error property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
error: (msg: string, meta: LogMeta) => void;
11+
```

docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export interface SavedObjectsMigrationLogger
1616
| Property | Type | Description |
1717
| --- | --- | --- |
1818
| [debug](./kibana-plugin-core-server.savedobjectsmigrationlogger.debug.md) | <code>(msg: string) =&gt; void</code> | |
19+
| [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md) | <code>(msg: string, meta: LogMeta) =&gt; void</code> | |
1920
| [info](./kibana-plugin-core-server.savedobjectsmigrationlogger.info.md) | <code>(msg: string) =&gt; void</code> | |
2021
| [warn](./kibana-plugin-core-server.savedobjectsmigrationlogger.warn.md) | <code>(msg: string) =&gt; void</code> | |
2122
| [warning](./kibana-plugin-core-server.savedobjectsmigrationlogger.warning.md) | <code>(msg: string) =&gt; void</code> | |
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IIndexPattern](./kibana-plugin-plugins-data-server.iindexpattern.md) &gt; [getTimeField](./kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md)
4+
5+
## IIndexPattern.getTimeField() method
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
getTimeField?(): IFieldType | undefined;
11+
```
12+
<b>Returns:</b>
13+
14+
`IFieldType | undefined`
15+

packages/kbn-dev-utils/src/proc_runner/proc_runner.ts

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,22 @@
1818
*/
1919

2020
import moment from 'moment';
21-
import { filter, first, catchError } from 'rxjs/operators';
21+
import * as Rx from 'rxjs';
22+
import { filter, first, catchError, map } from 'rxjs/operators';
2223
import exitHook from 'exit-hook';
2324

2425
import { ToolingLog } from '../tooling_log';
2526
import { createCliError } from './errors';
2627
import { Proc, ProcOptions, startProc } from './proc';
2728

29+
const SECOND = 1000;
30+
const MINUTE = 60 * SECOND;
31+
2832
const noop = () => {};
2933

3034
interface RunOptions extends ProcOptions {
3135
wait: true | RegExp;
36+
waitTimeout?: number | false;
3237
}
3338

3439
/**
@@ -71,6 +76,7 @@ export class ProcRunner {
7176
cwd = process.cwd(),
7277
stdin = undefined,
7378
wait = false,
79+
waitTimeout = 15 * MINUTE,
7480
env = process.env,
7581
} = options;
7682

@@ -97,8 +103,8 @@ export class ProcRunner {
97103
try {
98104
if (wait instanceof RegExp) {
99105
// wait for process to log matching line
100-
await proc.lines$
101-
.pipe(
106+
await Rx.race(
107+
proc.lines$.pipe(
102108
filter(line => wait.test(line)),
103109
first(),
104110
catchError(err => {
@@ -108,8 +114,18 @@ export class ProcRunner {
108114
throw err;
109115
}
110116
})
111-
)
112-
.toPromise();
117+
),
118+
waitTimeout === false
119+
? Rx.NEVER
120+
: Rx.timer(waitTimeout).pipe(
121+
map(() => {
122+
const sec = waitTimeout / SECOND;
123+
throw createCliError(
124+
`[${name}] failed to match pattern within ${sec} seconds [pattern=${wait}]`
125+
);
126+
})
127+
)
128+
).toPromise();
113129
}
114130

115131
if (wait === true) {

0 commit comments

Comments
 (0)