Skip to content

Commit 652d584

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into logs-alerting-phase-1-followups
2 parents 578591f + 3c56a8e commit 652d584

873 files changed

Lines changed: 6059 additions & 2707 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/Jenkinsfile_coverage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load() // load from the Jenkins instance
55

6-
kibanaPipeline(timeoutMinutes: 180) {
6+
kibanaPipeline(timeoutMinutes: 240) {
77
catchErrors {
88
withEnv([
99
'CODE_COVERAGE=1', // Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.

‎.github/CODEOWNERS‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
8585
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
8686
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
87-
/x-pack/legacy/plugins/uptime @elastic/uptime
8887
/x-pack/plugins/uptime @elastic/uptime
8988

9089
# Machine Learning
@@ -167,16 +166,13 @@
167166
/x-pack/plugins/telemetry_collection_xpack/ @elastic/pulse
168167

169168
# Kibana Alerting Services
170-
/x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
171-
/x-pack/legacy/plugins/actions/ @elastic/kibana-alerting-services
172169
/x-pack/plugins/alerting/ @elastic/kibana-alerting-services
173170
/x-pack/plugins/actions/ @elastic/kibana-alerting-services
174171
/x-pack/plugins/event_log/ @elastic/kibana-alerting-services
175172
/x-pack/plugins/task_manager/ @elastic/kibana-alerting-services
176173
/x-pack/test/alerting_api_integration/ @elastic/kibana-alerting-services
177174
/x-pack/test/plugin_api_integration/plugins/task_manager/ @elastic/kibana-alerting-services
178175
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/kibana-alerting-services
179-
/x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
180176
/x-pack/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
181177
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
182178
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
@@ -209,22 +205,21 @@
209205
/x-pack/plugins/watcher/ @elastic/es-ui
210206

211207
# Endpoint
212-
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team
213-
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team
214-
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team
215-
/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team
216-
/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team
217-
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team
218-
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team
219-
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team
208+
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
209+
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
210+
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
211+
/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team @elastic/siem
212+
/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team @elastic/siem
213+
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
214+
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
215+
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
220216

221217
# SIEM
222-
/x-pack/legacy/plugins/siem/ @elastic/siem
223-
/x-pack/plugins/siem/ @elastic/siem
224-
/x-pack/test/detection_engine_api_integration @elastic/siem
225-
/x-pack/test/api_integration/apis/siem @elastic/siem
226-
/x-pack/plugins/case @elastic/siem
227-
/x-pack/plugins/lists @elastic/siem
218+
/x-pack/plugins/siem/ @elastic/siem @elastic/endpoint-app-team
219+
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
220+
/x-pack/test/api_integration/apis/siem @elastic/siem @elastic/endpoint-app-team
221+
/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
222+
/x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
228223

229224
# Security Intelligence And Analytics
230225
/x-pack/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics

‎docs/development/core/public/kibana-plugin-core-public.appbase.defaultpath.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [defaultPath](./kibana-plugin-core-public.appbase.defaultpath.md)
4+
5+
## AppBase.defaultPath property
6+
7+
Allow to define the default path a user should be directed to when navigating to the app. When defined, this value will be used as a default for the `path` option when calling [navigateToApp](./kibana-plugin-core-public.applicationstart.navigatetoapp.md)<!-- -->\`<!-- -->, and will also be appended to the [application navLink](./kibana-plugin-core-public.chromenavlink.md) in the navigation bar.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
defaultPath?: string;
13+
```

‎docs/development/core/public/kibana-plugin-core-public.appbase.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export interface AppBase
1818
| [capabilities](./kibana-plugin-core-public.appbase.capabilities.md) | <code>Partial&lt;Capabilities&gt;</code> | Custom capabilities defined by the app. |
1919
| [category](./kibana-plugin-core-public.appbase.category.md) | <code>AppCategory</code> | The category definition of the product See [AppCategory](./kibana-plugin-core-public.appcategory.md) See DEFAULT\_APP\_CATEGORIES for more reference |
2020
| [chromeless](./kibana-plugin-core-public.appbase.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
21+
| [defaultPath](./kibana-plugin-core-public.appbase.defaultpath.md) | <code>string</code> | Allow to define the default path a user should be directed to when navigating to the app. When defined, this value will be used as a default for the <code>path</code> option when calling [navigateToApp](./kibana-plugin-core-public.applicationstart.navigatetoapp.md)<!-- -->\`<!-- -->, and will also be appended to the [application navLink](./kibana-plugin-core-public.chromenavlink.md) in the navigation bar. |
2122
| [euiIconType](./kibana-plugin-core-public.appbase.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
2223
| [icon](./kibana-plugin-core-public.appbase.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
2324
| [id](./kibana-plugin-core-public.appbase.id.md) | <code>string</code> | The unique identifier of the application |

‎docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Defines the list of fields that can be updated via an [AppUpdater](./kibana-plug
99
<b>Signature:</b>
1010

1111
```typescript
12-
export declare type AppUpdatableFields = Pick<AppBase, 'status' | 'navLinkStatus' | 'tooltip'>;
12+
export declare type AppUpdatableFields = Pick<AppBase, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath'>;
1313
```

‎docs/development/core/public/kibana-plugin-core-public.chromenavlink.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ export interface ChromeNavLink
2929
| [subUrlBase](./kibana-plugin-core-public.chromenavlink.suburlbase.md) | <code>string</code> | A url base that legacy apps can set to match deep URLs to an application. |
3030
| [title](./kibana-plugin-core-public.chromenavlink.title.md) | <code>string</code> | The title of the application. |
3131
| [tooltip](./kibana-plugin-core-public.chromenavlink.tooltip.md) | <code>string</code> | A tooltip shown when hovering over an app link. |
32-
| [url](./kibana-plugin-core-public.chromenavlink.url.md) | <code>string</code> | A url that legacy apps can set to deep link into their applications. |
32+
| [url](./kibana-plugin-core-public.chromenavlink.url.md) | <code>string</code> | The route used to open the [default path](./kibana-plugin-core-public.appbase.defaultpath.md) of an application. If unset, <code>baseUrl</code> will be used instead. |
3333

‎docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md‎

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

55
## ChromeNavLink.url property
66

7-
> Warning: This API is now obsolete.
8-
>
9-
>
10-
11-
A url that legacy apps can set to deep link into their applications.
7+
The route used to open the [default path](./kibana-plugin-core-public.appbase.defaultpath.md) of an application. If unset, `baseUrl` will be used instead.
128

139
<b>Signature:</b>
1410

‎docs/development/core/server/kibana-plugin-core-server.savedobjectmigrationfn.md‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,36 @@ A migration function for a [saved object type](./kibana-plugin-core-server.saved
99
<b>Signature:</b>
1010

1111
```typescript
12-
export declare type SavedObjectMigrationFn = (doc: SavedObjectUnsanitizedDoc, context: SavedObjectMigrationContext) => SavedObjectUnsanitizedDoc;
12+
export declare type SavedObjectMigrationFn<InputAttributes = unknown, MigratedAttributes = unknown> = (doc: SavedObjectUnsanitizedDoc<InputAttributes>, context: SavedObjectMigrationContext) => SavedObjectUnsanitizedDoc<MigratedAttributes>;
1313
```
1414

1515
## Example
1616

1717

1818
```typescript
19-
const migrateProperty: SavedObjectMigrationFn = (doc, { log }) => {
20-
if(doc.attributes.someProp === null) {
21-
log.warn('Skipping migration');
22-
} else {
23-
doc.attributes.someProp = migrateProperty(doc.attributes.someProp);
24-
}
25-
26-
return doc;
19+
interface TypeV1Attributes {
20+
someKey: string;
21+
obsoleteProperty: number;
2722
}
2823

24+
interface TypeV2Attributes {
25+
someKey: string;
26+
newProperty: string;
27+
}
28+
29+
const migrateToV2: SavedObjectMigrationFn<TypeV1Attributes, TypeV2Attributes> = (doc, { log }) => {
30+
const { obsoleteProperty, ...otherAttributes } = doc.attributes;
31+
// instead of mutating `doc` we make a shallow copy so that we can use separate types for the input
32+
// and output attributes. We don't need to make a deep copy, we just need to ensure that obsolete
33+
// attributes are not present on the returned doc.
34+
return {
35+
...doc,
36+
attributes: {
37+
...otherAttributes,
38+
newProperty: migrate(obsoleteProperty),
39+
},
40+
};
41+
};
42+
2943
```
3044

‎docs/development/core/server/kibana-plugin-core-server.savedobjectsanitizeddoc.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Describes Saved Object documents that have passed through the migration framewor
99
<b>Signature:</b>
1010

1111
```typescript
12-
export declare type SavedObjectSanitizedDoc = SavedObjectDoc & Referencable;
12+
export declare type SavedObjectSanitizedDoc<T = unknown> = SavedObjectDoc<T> & Referencable;
1313
```

‎docs/development/core/server/kibana-plugin-core-server.savedobjectunsanitizeddoc.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Describes Saved Object documents from Kibana &lt; 7.0.0 which don't have a `refe
99
<b>Signature:</b>
1010

1111
```typescript
12-
export declare type SavedObjectUnsanitizedDoc = SavedObjectDoc & Partial<Referencable>;
12+
export declare type SavedObjectUnsanitizedDoc<T = unknown> = SavedObjectDoc<T> & Partial<Referencable>;
1313
```

0 commit comments

Comments
 (0)