Skip to content

Commit

Permalink
Merge branch 'master' into monitoring/ecs_final_es
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Apr 22, 2021
2 parents f2df4ad + fc45de9 commit 7166642
Show file tree
Hide file tree
Showing 320 changed files with 6,383 additions and 3,003 deletions.
1 change: 1 addition & 0 deletions docs/developer/getting-started/monorepo-packages.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,5 @@ yarn kbn watch-bazel
- @kbn/std
- @kbn/tinymath
- @kbn/utility-types
- @kbn/utils

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
interpret<T>(ast: ExpressionAstNode, input: T): Promise<unknown>;
interpret<T>(ast: ExpressionAstNode, input: T): Observable<unknown>;
```

## Parameters
Expand All @@ -19,5 +19,5 @@ interpret<T>(ast: ExpressionAstNode, input: T): Promise<unknown>;

<b>Returns:</b>

`Promise<unknown>`
`Observable<unknown>`

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
invokeChain(chainArr: ExpressionAstFunction[], input: unknown): Promise<any>;
invokeChain(chainArr: ExpressionAstFunction[], input: unknown): Observable<any>;
```

## Parameters
Expand All @@ -19,5 +19,5 @@ invokeChain(chainArr: ExpressionAstFunction[], input: unknown): Promise<any>;

<b>Returns:</b>

`Promise<any>`
`Observable<any>`

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
invokeFunction(fn: ExpressionFunction, input: unknown, args: Record<string, unknown>): Promise<any>;
invokeFunction(fn: ExpressionFunction, input: unknown, args: Record<string, unknown>): Observable<any>;
```

## Parameters
Expand All @@ -20,5 +20,5 @@ invokeFunction(fn: ExpressionFunction, input: unknown, args: Record<string, unkn

<b>Returns:</b>

`Promise<any>`
`Observable<any>`

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export declare class Execution<Input = unknown, Output = unknown, InspectorAdapt
| [expression](./kibana-plugin-plugins-expressions-public.execution.expression.md) | | <code>string</code> | |
| [input](./kibana-plugin-plugins-expressions-public.execution.input.md) | | <code>Input</code> | Initial input of the execution.<!-- -->N.B. It is initialized to <code>null</code> rather than <code>undefined</code> for legacy reasons, because in legacy interpreter it was set to <code>null</code> by default. |
| [inspectorAdapters](./kibana-plugin-plugins-expressions-public.execution.inspectoradapters.md) | | <code>InspectorAdapters</code> | |
| [result](./kibana-plugin-plugins-expressions-public.execution.result.md) | | <code>Promise&lt;Output &#124; ExpressionValueError&gt;</code> | |
| [result](./kibana-plugin-plugins-expressions-public.execution.result.md) | | <code>Observable&lt;Output &#124; ExpressionValueError&gt;</code> | Future that tracks result or error of this execution. |
| [state](./kibana-plugin-plugins-expressions-public.execution.state.md) | | <code>ExecutionContainer&lt;Output &#124; ExpressionValueError&gt;</code> | Dynamic state of the execution. |

## Methods
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
resolveArgs(fnDef: ExpressionFunction, input: unknown, argAsts: any): Promise<any>;
resolveArgs(fnDef: ExpressionFunction, input: unknown, argAsts: any): Observable<any>;
```

## Parameters
Expand All @@ -20,5 +20,5 @@ resolveArgs(fnDef: ExpressionFunction, input: unknown, argAsts: any): Promise<an

<b>Returns:</b>

`Promise<any>`
`Observable<any>`

Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

## Execution.result property

Future that tracks result or error of this execution.

<b>Signature:</b>

```typescript
get result(): Promise<Output | ExpressionValueError>;
readonly result: Observable<Output | ExpressionValueError>;
```
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ N.B. `input` is initialized to `null` rather than `undefined` for legacy reasons
<b>Signature:</b>

```typescript
start(input?: Input): void;
start(input?: Input): Observable<Output | ExpressionValueError>;
```

## Parameters
Expand All @@ -22,5 +22,5 @@ start(input?: Input): void;

<b>Returns:</b>

`void`
`Observable<Output | ExpressionValueError>`

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Execute expression and return result.
<b>Signature:</b>

```typescript
run<Input, Output>(ast: string | ExpressionAstExpression, input: Input, params?: ExpressionExecutionParams): Promise<Output>;
run<Input, Output>(ast: string | ExpressionAstExpression, input: Input, params?: ExpressionExecutionParams): Observable<Output | ExpressionValueError>;
```

## Parameters
Expand All @@ -22,5 +22,5 @@ run<Input, Output>(ast: string | ExpressionAstExpression, input: Input, params?:

<b>Returns:</b>

`Promise<Output>`
`Observable<Output | ExpressionValueError>`

Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ If the type extends a Promise, we still need to return the string representation
<b>Signature:</b>

```typescript
export declare type TypeString<T> = KnownTypeToString<UnwrapPromiseOrReturn<T>>;
export declare type TypeString<T> = KnownTypeToString<T extends ObservableLike<any> ? UnwrapObservable<T> : UnwrapPromiseOrReturn<T>>;
```
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
interpret<T>(ast: ExpressionAstNode, input: T): Promise<unknown>;
interpret<T>(ast: ExpressionAstNode, input: T): Observable<unknown>;
```

## Parameters
Expand All @@ -19,5 +19,5 @@ interpret<T>(ast: ExpressionAstNode, input: T): Promise<unknown>;

<b>Returns:</b>

`Promise<unknown>`
`Observable<unknown>`

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
invokeChain(chainArr: ExpressionAstFunction[], input: unknown): Promise<any>;
invokeChain(chainArr: ExpressionAstFunction[], input: unknown): Observable<any>;
```

## Parameters
Expand All @@ -19,5 +19,5 @@ invokeChain(chainArr: ExpressionAstFunction[], input: unknown): Promise<any>;

<b>Returns:</b>

`Promise<any>`
`Observable<any>`

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
invokeFunction(fn: ExpressionFunction, input: unknown, args: Record<string, unknown>): Promise<any>;
invokeFunction(fn: ExpressionFunction, input: unknown, args: Record<string, unknown>): Observable<any>;
```

## Parameters
Expand All @@ -20,5 +20,5 @@ invokeFunction(fn: ExpressionFunction, input: unknown, args: Record<string, unkn

<b>Returns:</b>

`Promise<any>`
`Observable<any>`

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export declare class Execution<Input = unknown, Output = unknown, InspectorAdapt
| [expression](./kibana-plugin-plugins-expressions-server.execution.expression.md) | | <code>string</code> | |
| [input](./kibana-plugin-plugins-expressions-server.execution.input.md) | | <code>Input</code> | Initial input of the execution.<!-- -->N.B. It is initialized to <code>null</code> rather than <code>undefined</code> for legacy reasons, because in legacy interpreter it was set to <code>null</code> by default. |
| [inspectorAdapters](./kibana-plugin-plugins-expressions-server.execution.inspectoradapters.md) | | <code>InspectorAdapters</code> | |
| [result](./kibana-plugin-plugins-expressions-server.execution.result.md) | | <code>Promise&lt;Output &#124; ExpressionValueError&gt;</code> | |
| [result](./kibana-plugin-plugins-expressions-server.execution.result.md) | | <code>Observable&lt;Output &#124; ExpressionValueError&gt;</code> | Future that tracks result or error of this execution. |
| [state](./kibana-plugin-plugins-expressions-server.execution.state.md) | | <code>ExecutionContainer&lt;Output &#124; ExpressionValueError&gt;</code> | Dynamic state of the execution. |

## Methods
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<b>Signature:</b>

```typescript
resolveArgs(fnDef: ExpressionFunction, input: unknown, argAsts: any): Promise<any>;
resolveArgs(fnDef: ExpressionFunction, input: unknown, argAsts: any): Observable<any>;
```

## Parameters
Expand All @@ -20,5 +20,5 @@ resolveArgs(fnDef: ExpressionFunction, input: unknown, argAsts: any): Promise<an

<b>Returns:</b>

`Promise<any>`
`Observable<any>`

Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

## Execution.result property

Future that tracks result or error of this execution.

<b>Signature:</b>

```typescript
get result(): Promise<Output | ExpressionValueError>;
readonly result: Observable<Output | ExpressionValueError>;
```
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ N.B. `input` is initialized to `null` rather than `undefined` for legacy reasons
<b>Signature:</b>

```typescript
start(input?: Input): void;
start(input?: Input): Observable<Output | ExpressionValueError>;
```

## Parameters
Expand All @@ -22,5 +22,5 @@ start(input?: Input): void;

<b>Returns:</b>

`void`
`Observable<Output | ExpressionValueError>`

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Execute expression and return result.
<b>Signature:</b>

```typescript
run<Input, Output>(ast: string | ExpressionAstExpression, input: Input, params?: ExpressionExecutionParams): Promise<Output>;
run<Input, Output>(ast: string | ExpressionAstExpression, input: Input, params?: ExpressionExecutionParams): Observable<Output | ExpressionValueError>;
```

## Parameters
Expand All @@ -22,5 +22,5 @@ run<Input, Output>(ast: string | ExpressionAstExpression, input: Input, params?:

<b>Returns:</b>

`Promise<Output>`
`Observable<Output | ExpressionValueError>`

Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ If the type extends a Promise, we still need to return the string representation
<b>Signature:</b>

```typescript
export declare type TypeString<T> = KnownTypeToString<UnwrapPromiseOrReturn<T>>;
export declare type TypeString<T> = KnownTypeToString<T extends ObservableLike<any> ? UnwrapObservable<T> : UnwrapPromiseOrReturn<T>>;
```
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"@kbn/ui-framework": "link:packages/kbn-ui-framework",
"@kbn/ui-shared-deps": "link:packages/kbn-ui-shared-deps",
"@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module",
"@kbn/utils": "link:packages/kbn-utils",
"@kbn/utils": "link:bazel-bin/packages/kbn-utils/npm_module",
"@loaders.gl/core": "^2.3.1",
"@loaders.gl/json": "^2.3.1",
"@mapbox/geojson-rewind": "^0.5.0",
Expand Down Expand Up @@ -300,6 +300,7 @@
"p-retry": "^4.2.0",
"papaparse": "^5.2.0",
"pdfmake": "^0.1.65",
"peggy": "^1.0.0",
"pegjs": "0.10.0",
"pluralize": "3.1.0",
"pngjs": "^3.4.0",
Expand Down
1 change: 1 addition & 0 deletions packages/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ filegroup(
"//packages/kbn-std:build",
"//packages/kbn-tinymath:build",
"//packages/kbn-utility-types:build",
"//packages/kbn-utils:build",
],
)
3 changes: 1 addition & 2 deletions packages/kbn-apm-config-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"kbn:watch": "yarn build --watch"
},
"dependencies": {
"@elastic/safer-lodash-set": "link:../elastic-safer-lodash-set",
"@kbn/utils": "link:../kbn-utils"
"@elastic/safer-lodash-set": "link:../elastic-safer-lodash-set"
}
}
3 changes: 1 addition & 2 deletions packages/kbn-cli-dev-mode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"@kbn/logging": "link:../kbn-logging",
"@kbn/server-http-tools": "link:../kbn-server-http-tools",
"@kbn/optimizer": "link:../kbn-optimizer",
"@kbn/dev-utils": "link:../kbn-dev-utils",
"@kbn/utils": "link:../kbn-utils"
"@kbn/dev-utils": "link:../kbn-dev-utils"
}
}
3 changes: 1 addition & 2 deletions packages/kbn-config-schema/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,14 @@ ts_project(

js_library(
name = PKG_BASE_NAME,
srcs = [],
srcs = NPM_MODULE_EXTRA_FILES,
deps = [":tsc"] + DEPS,
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)

pkg_npm(
name = "npm_module",
srcs = NPM_MODULE_EXTRA_FILES,
deps = [
":%s" % PKG_BASE_NAME,
]
Expand Down
3 changes: 0 additions & 3 deletions packages/kbn-dev-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
"kibana": {
"devOnly": true
},
"dependencies": {
"@kbn/utils": "link:../kbn-utils"
},
"devDependencies": {
"@kbn/expect": "link:../kbn-expect"
}
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-docs-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"kbn:watch": "../../node_modules/.bin/tsc --watch"
},
"dependencies": {
"@kbn/utils": "link:../kbn-utils",
"@kbn/config": "link:../kbn-config",
"@kbn/dev-utils": "link:../kbn-dev-utils"
}
Expand Down
3 changes: 1 addition & 2 deletions packages/kbn-es-archiver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
},
"dependencies": {
"@kbn/dev-utils": "link:../kbn-dev-utils",
"@kbn/test": "link:../kbn-test",
"@kbn/utils": "link:../kbn-utils"
"@kbn/test": "link:../kbn-test"
}
}
2 changes: 1 addition & 1 deletion packages/kbn-es/src/cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ exports.Cluster = class Cluster {
// especially because we currently run many instances of ES on the same machine during CI
options.esEnvVars.ES_JAVA_OPTS =
(options.esEnvVars.ES_JAVA_OPTS ? `${options.esEnvVars.ES_JAVA_OPTS} ` : '') +
'-Xms1g -Xmx1g';
'-Xms2g -Xmx2g';

this._process = execa(ES_BIN, args, {
cwd: installPath,
Expand Down
3 changes: 0 additions & 3 deletions packages/kbn-legacy-logging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@
"build": "tsc",
"kbn:bootstrap": "yarn build",
"kbn:watch": "yarn build --watch"
},
"dependencies": {
"@kbn/utils": "link:../kbn-utils"
}
}
3 changes: 0 additions & 3 deletions packages/kbn-pm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,5 @@
},
"devDependencies": {
"@kbn/dev-utils": "link:../kbn-dev-utils"
},
"dependencies": {
"@kbn/utils": "link:../kbn-utils"
}
}
3 changes: 1 addition & 2 deletions packages/kbn-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
},
"devDependencies": {
"@kbn/dev-utils": "link:../kbn-dev-utils",
"@kbn/expect": "link:../kbn-expect",
"@kbn/utils": "link:../kbn-utils"
"@kbn/expect": "link:../kbn-expect"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@ it(
'produces a valid junit report for failures',
async () => {
const result = await execa(
'./node_modules/.bin/jest',
['--config', 'packages/kbn-test/src/jest/integration_tests/__fixtures__/jest.config.js'],
'node',
[
'--preserve-symlinks',
'./node_modules/.bin/jest',
'--config',
'packages/kbn-test/src/jest/integration_tests/__fixtures__/jest.config.js',
],
{
cwd: REPO_ROOT,
env: {
Expand Down
Loading

0 comments on commit 7166642

Please sign in to comment.