Skip to content

Commit 495fbbd

Browse files
committed
Merge remote-tracking branch 'upstream/master' into task/fleet-82492-integration-custom-tab
2 parents ae81b29 + ea8ea4e commit 495fbbd

232 files changed

Lines changed: 5503 additions & 2216 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.

.ci/es-snapshots/Jenkinsfile_verify_es

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ kibanaPipeline(timeoutMinutes: 150) {
5555
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
5656
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
5757
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
58+
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
5859
]),
5960
])
6061
}

.ci/jobs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ JOB:
3131
- x-pack-ciGroup8
3232
- x-pack-ciGroup9
3333
- x-pack-ciGroup10
34+
- x-pack-ciGroup11
3435
- x-pack-accessibility
3536
- x-pack-visualRegression
3637

.ci/packer_cache_for_branch.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
4949
.chromium \
5050
.es \
5151
.chromedriver \
52-
.geckodriver;
52+
.geckodriver \
53+
.yarn-local-mirror;
5354

5455
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
5556

.github/CODEOWNERS

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,28 @@
204204
#CC# /x-pack/plugins/features/ @elastic/kibana-core
205205
#CC# /x-pack/plugins/global_search/ @elastic/kibana-core
206206

207+
# Kibana Telemetry
208+
/packages/kbn-analytics/ @elastic/kibana-core
209+
/packages/kbn-telemetry-tools/ @elastic/kibana-core
210+
/src/plugins/kibana_usage_collection/ @elastic/kibana-core
211+
/src/plugins/newsfeed/ @elastic/kibana-core
212+
/src/plugins/telemetry/ @elastic/kibana-core
213+
/src/plugins/telemetry_collection_manager/ @elastic/kibana-core
214+
/src/plugins/telemetry_management_section/ @elastic/kibana-core
215+
/src/plugins/usage_collection/ @elastic/kibana-core
216+
/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-core
217+
/.telemetryrc.json @elastic/kibana-core
218+
/x-pack/.telemetryrc.json @elastic/kibana-core
219+
src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-core
220+
src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-core
221+
x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-core
222+
223+
# Kibana Localization
224+
/src/dev/i18n/ @elastic/kibana-localization @elastic/kibana-core
225+
/src/core/public/i18n/ @elastic/kibana-localization @elastic/kibana-core
226+
/packages/kbn-i18n/ @elastic/kibana-localization @elastic/kibana-core
227+
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core
228+
207229
# Security
208230
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
209231
/src/plugins/security_oss/ @elastic/kibana-security
@@ -221,28 +243,6 @@
221243
#CC# /x-pack/plugins/security_solution/ @elastic/kibana-security
222244
#CC# /x-pack/plugins/security/ @elastic/kibana-security
223245

224-
# Kibana Localization
225-
/src/dev/i18n/ @elastic/kibana-localization
226-
/src/core/public/i18n/ @elastic/kibana-localization
227-
/packages/kbn-i18n/ @elastic/kibana-localization
228-
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization
229-
230-
# Kibana Telemetry
231-
/packages/kbn-analytics/ @elastic/kibana-telemetry
232-
/packages/kbn-telemetry-tools/ @elastic/kibana-telemetry
233-
/src/plugins/kibana_usage_collection/ @elastic/kibana-telemetry
234-
/src/plugins/newsfeed/ @elastic/kibana-telemetry
235-
/src/plugins/telemetry/ @elastic/kibana-telemetry
236-
/src/plugins/telemetry_collection_manager/ @elastic/kibana-telemetry
237-
/src/plugins/telemetry_management_section/ @elastic/kibana-telemetry
238-
/src/plugins/usage_collection/ @elastic/kibana-telemetry
239-
/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-telemetry
240-
/.telemetryrc.json @elastic/kibana-telemetry
241-
/x-pack/.telemetryrc.json @elastic/kibana-telemetry
242-
src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-telemetry
243-
src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-telemetry
244-
x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-telemetry
245-
246246
# Kibana Alerting Services
247247
/x-pack/plugins/alerts/ @elastic/kibana-alerting-services
248248
/x-pack/plugins/actions/ @elastic/kibana-alerting-services

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ report.asciidoc
7575

7676
# TS incremental build cache
7777
*.tsbuildinfo
78+
79+
# Yarn local mirror content
80+
.yarn-local-mirror

.yarnrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Configure an offline yarn mirror in the data folder
2+
yarn-offline-mirror ".yarn-local-mirror"
3+
4+
# Always look into the cache first before fetching online
5+
--install.prefer-offline true

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

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

1111
```typescript
12-
constructor(err: IEsError, request: IKibanaSearchRequest);
12+
constructor(err: IEsError);
1313
```
1414

1515
## Parameters
1616

1717
| Parameter | Type | Description |
1818
| --- | --- | --- |
1919
| err | <code>IEsError</code> | |
20-
| request | <code>IKibanaSearchRequest</code> | |
2120

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export declare class PainlessError extends EsError
1414
1515
| Constructor | Modifiers | Description |
1616
| --- | --- | --- |
17-
| [(constructor)(err, request)](./kibana-plugin-plugins-data-public.painlesserror._constructor_.md) | | Constructs a new instance of the <code>PainlessError</code> class |
17+
| [(constructor)(err)](./kibana-plugin-plugins-data-public.painlesserror._constructor_.md) | | Constructs a new instance of the <code>PainlessError</code> class |
1818
1919
## Properties
2020

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

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

99
```typescript
10-
setup(core: CoreSetup<DataStartDependencies, DataPublicPluginStart>, { expressions, uiActions, usageCollection }: DataSetupDependencies): DataPublicPluginSetup;
10+
setup(core: CoreSetup<DataStartDependencies, DataPublicPluginStart>, { bfetch, expressions, uiActions, usageCollection }: DataSetupDependencies): DataPublicPluginSetup;
1111
```
1212

1313
## Parameters
1414

1515
| Parameter | Type | Description |
1616
| --- | --- | --- |
1717
| core | <code>CoreSetup&lt;DataStartDependencies, DataPublicPluginStart&gt;</code> | |
18-
| { expressions, uiActions, usageCollection } | <code>DataSetupDependencies</code> | |
18+
| { bfetch, expressions, uiActions, usageCollection } | <code>DataSetupDependencies</code> | |
1919

2020
<b>Returns:</b>
2121

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

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

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

1313
## Parameters
1414

1515
| Parameter | Type | Description |
1616
| --- | --- | --- |
1717
| e | <code>any</code> | |
18-
| request | <code>IKibanaSearchRequest</code> | |
1918
| timeoutSignal | <code>AbortSignal</code> | |
2019
| options | <code>ISearchOptions</code> | |
2120

0 commit comments

Comments
 (0)