Skip to content

Commit 4808729

Browse files
Merge branch 'master' into dev/session/dashboard-session-clear
2 parents 78eeff0 + af337ce commit 4808729

File tree

425 files changed

+6405
-4704
lines changed

Some content is hidden

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

425 files changed

+6405
-4704
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
# APM
6767
/x-pack/plugins/apm/ @elastic/apm-ui
6868
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
69+
/x-pack/test/apm_api_integration/ @elastic/apm-ui
6970
/src/plugins/apm_oss/ @elastic/apm-ui
7071
/src/apm.js @elastic/kibana-core @vigneshshanmugam
7172
/packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
@@ -80,6 +81,7 @@
8081
/x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
8182
/x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
8283
/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
84+
/x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime
8385

8486
# Beats
8587
/x-pack/plugins/beats_management/ @elastic/beats
@@ -99,7 +101,7 @@
99101

100102
# Observability UIs
101103
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
102-
/x-pack/plugins/fleet/ @elastic/ingest-management
104+
/x-pack/plugins/fleet/ @elastic/fleet
103105
/x-pack/plugins/observability/ @elastic/observability-ui
104106
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
105107
/x-pack/plugins/uptime @elastic/uptime

.github/paths-labeller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- "src/plugins/bfetch/**/*.*"
1111
- "Team:apm":
1212
- "x-pack/plugins/apm/**/*.*"
13-
- "Team:Ingest Management":
13+
- "Team:Fleet":
1414
- "x-pack/plugins/fleet/**/*.*"
1515
- "x-pack/test/fleet_api_integration/**/*.*"
1616
- "Team:uptime":

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<b>Signature:</b>
88

99
```typescript
10-
protected handleSearchError(e: any, timeoutSignal: AbortSignal, options?: ISearchOptions): Error;
10+
protected handleSearchError(e: KibanaServerError | AbortError, timeoutSignal: AbortSignal, options?: ISearchOptions): Error;
1111
```
1212

1313
## Parameters
1414

1515
| Parameter | Type | Description |
1616
| --- | --- | --- |
17-
| e | <code>any</code> | |
17+
| e | <code>KibanaServerError &#124; AbortError</code> | |
1818
| timeoutSignal | <code>AbortSignal</code> | |
1919
| options | <code>ISearchOptions</code> | |
2020

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44

55
## SearchSource.fetch() method
66

7-
Fetch this source and reject the returned Promise on error
7+
> Warning: This API is now obsolete.
8+
>
9+
> Use fetch$ instead
10+
>
811
12+
Fetch this source and reject the returned Promise on error
913

1014
<b>Signature:</b>
1115

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) &gt; [fetch$](./kibana-plugin-plugins-data-public.searchsource.fetch_.md)
4+
5+
## SearchSource.fetch$() method
6+
7+
Fetch this source from Elasticsearch, returning an observable over the response(s)
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
fetch$(options?: ISearchOptions): import("rxjs").Observable<import("elasticsearch").SearchResponse<any>>;
13+
```
14+
15+
## Parameters
16+
17+
| Parameter | Type | Description |
18+
| --- | --- | --- |
19+
| options | <code>ISearchOptions</code> | |
20+
21+
<b>Returns:</b>
22+
23+
`import("rxjs").Observable<import("elasticsearch").SearchResponse<any>>`
24+

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export declare class SearchSource
3333
| [createCopy()](./kibana-plugin-plugins-data-public.searchsource.createcopy.md) | | creates a copy of this search source (without its children) |
3434
| [destroy()](./kibana-plugin-plugins-data-public.searchsource.destroy.md) | | Completely destroy the SearchSource. {<!-- -->undefined<!-- -->} |
3535
| [fetch(options)](./kibana-plugin-plugins-data-public.searchsource.fetch.md) | | Fetch this source and reject the returned Promise on error |
36+
| [fetch$(options)](./kibana-plugin-plugins-data-public.searchsource.fetch_.md) | | Fetch this source from Elasticsearch, returning an observable over the response(s) |
3637
| [getField(field, recurse)](./kibana-plugin-plugins-data-public.searchsource.getfield.md) | | Gets a single field from the fields |
3738
| [getFields()](./kibana-plugin-plugins-data-public.searchsource.getfields.md) | | returns all search source fields |
3839
| [getId()](./kibana-plugin-plugins-data-public.searchsource.getid.md) | | returns search source id |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchtimeouterror._constructor_.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Constructs a new instance of the `SearchTimeoutError` class
99
<b>Signature:</b>
1010

1111
```typescript
12-
constructor(err: Error, mode: TimeoutErrorMode);
12+
constructor(err: Record<string, any>, mode: TimeoutErrorMode);
1313
```
1414

1515
## Parameters
1616

1717
| Parameter | Type | Description |
1818
| --- | --- | --- |
19-
| err | <code>Error</code> | |
19+
| err | <code>Record&lt;string, any&gt;</code> | |
2020
| mode | <code>TimeoutErrorMode</code> | |
2121

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* and the Server Side Public License, v 1; you may not use this file except in
5+
* compliance with, at your election, the Elastic License or the Server Side
6+
* Public License, v 1.
7+
*/
8+
9+
import { Server } from '@hapi/hapi';
10+
import { reconfigureLogging, setupLogging } from './setup_logging';
11+
import { LegacyLoggingConfig } from './schema';
12+
13+
describe('reconfigureLogging', () => {
14+
test(`doesn't throw an error`, () => {
15+
const server = new Server();
16+
const config: LegacyLoggingConfig = {
17+
silent: false,
18+
quiet: false,
19+
verbose: true,
20+
events: {},
21+
dest: '/tmp/foo',
22+
filter: {},
23+
json: true,
24+
rotate: {
25+
enabled: false,
26+
everyBytes: 0,
27+
keepFiles: 0,
28+
pollingInterval: 0,
29+
usePolling: false,
30+
},
31+
};
32+
setupLogging(server, config, 10);
33+
reconfigureLogging(server, { ...config, dest: '/tmp/bar' }, 0);
34+
});
35+
});

packages/kbn-legacy-logging/src/setup_logging.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ export function reconfigureLogging(
3737
opsInterval: number
3838
) {
3939
const loggingOptions = getLoggingConfiguration(config, opsInterval);
40-
(server.plugins as any)['@elastic/good'].reconfigure(loggingOptions);
40+
(server.plugins as any).good.reconfigure(loggingOptions);
4141
}

src/plugins/dashboard/server/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ export function plugin(initializerContext: PluginInitializerContext) {
2525
}
2626

2727
export { DashboardPluginSetup, DashboardPluginStart } from './types';
28+
export { findByValueEmbeddables } from './usage/find_by_value_embeddables';

0 commit comments

Comments
 (0)