Skip to content

Commit 89e113f

Browse files
ymao1ymao1
committed
Merge branch 'master' of https://github.com/elastic/kibana into alerting/email-links-space-id
2 parents 64414fc + 7fd6539 commit 89e113f

401 files changed

Lines changed: 7622 additions & 21084 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.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@
9494
/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
9595
/x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime
9696

97-
# Beats
98-
/x-pack/plugins/beats_management/ @elastic/beats
99-
#CC# /x-pack/plugins/beats_management/ @elastic/beats
10097

10198
# Presentation
10299
/src/plugins/dashboard/ @elastic/kibana-presentation
@@ -150,6 +147,7 @@
150147
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
151148
/src/plugins/tile_map/ @elastic/kibana-gis
152149
/src/plugins/region_map/ @elastic/kibana-gis
150+
/packages/kbn-mapbox-gl @elastic/kibana-gis
153151

154152
# Operations
155153
/src/dev/ @elastic/kibana-operations

‎.i18nrc.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"paths": {
3-
"common.ui": "src/legacy/ui",
43
"console": "src/plugins/console",
54
"core": "src/core",
65
"discover": "src/plugins/discover",
@@ -61,6 +60,5 @@
6160
"apmOss": "src/plugins/apm_oss",
6261
"usageCollection": "src/plugins/usage_collection"
6362
},
64-
"exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
6563
"translations": []
6664
}

‎api_docs/alerting.json‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -516,13 +516,15 @@
516516
"label": "rule",
517517
"description": [],
518518
"signature": [
519+
"Pick<Pick<",
519520
{
520521
"pluginId": "alerting",
521522
"scope": "common",
522523
"docId": "kibAlertingPluginApi",
523-
"section": "def-common.SanitizedRuleConfig",
524-
"text": "SanitizedRuleConfig"
525-
}
524+
"section": "def-common.Alert",
525+
"text": "Alert"
526+
},
527+
"<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
526528
],
527529
"source": {
528530
"path": "x-pack/plugins/alerting/server/types.ts",
@@ -840,7 +842,7 @@
840842
"description": [],
841843
"source": {
842844
"path": "x-pack/plugins/alerting/server/types.ts",
843-
"lineNumber": 75
845+
"lineNumber": 76
844846
},
845847
"deprecated": false
846848
}
@@ -1030,7 +1032,7 @@
10301032
],
10311033
"source": {
10321034
"path": "x-pack/plugins/alerting/server/types.ts",
1033-
"lineNumber": 107
1035+
"lineNumber": 109
10341036
},
10351037
"deprecated": false
10361038
}
@@ -3913,7 +3915,15 @@
39133915
"label": "SanitizedRuleConfig",
39143916
"description": [],
39153917
"signature": [
3916-
"Pick<Pick<Alert<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"muteAll\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
3918+
"Pick<Pick<",
3919+
{
3920+
"pluginId": "alerting",
3921+
"scope": "common",
3922+
"docId": "kibAlertingPluginApi",
3923+
"section": "def-common.Alert",
3924+
"text": "Alert"
3925+
},
3926+
"<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
39173927
],
39183928
"source": {
39193929
"path": "x-pack/plugins/alerting/common/alert.ts",

‎api_docs/beats_management.json‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎api_docs/beats_management.mdx‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)