Skip to content

Commit 937df1a

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix-anomaly-wizard-runtime-saved-search
2 parents ec81073 + 9d8a2f1 commit 937df1a

576 files changed

Lines changed: 16083 additions & 14811 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/packer_cache.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22

33
set -e
44

5+
# cache image used by kibana-load-testing project
6+
docker pull "maven:3.6.3-openjdk-8-slim"
7+
58
./.ci/packer_cache_for_branch.sh master
69
./.ci/packer_cache_for_branch.sh 7.x

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
9393
const DEV_PACKAGES = [
9494
'kbn-babel-code-parser',
9595
'kbn-dev-utils',
96+
'kbn-cli-dev-mode',
9697
'kbn-docs-utils',
9798
'kbn-es*',
9899
'kbn-eslint*',

.github/CODEOWNERS

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,23 @@
119119

120120
# Machine Learning
121121
/x-pack/plugins/ml/ @elastic/ml-ui
122+
/x-pack/test/accessibility/apps/ml.ts @elastic/ml-ui
123+
/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts @elastic/ml-ui
124+
/x-pack/test/api_integration/apis/ml/ @elastic/ml-ui
125+
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
122126
/x-pack/test/functional/apps/ml/ @elastic/ml-ui
127+
/x-pack/test/functional/es_archives/ml/ @elastic/ml-ui
123128
/x-pack/test/functional/services/ml/ @elastic/ml-ui
124-
/x-pack/test/accessibility/apps/ml.ts @elastic/ml-ui
129+
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
130+
/x-pack/test/functional_with_es_ssl/apps/ml/ @elastic/ml-ui
131+
125132
# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
126133
/x-pack/plugins/transform/ @elastic/ml-ui
127-
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
128-
/x-pack/test/functional/services/transform/ @elastic/ml-ui
129134
/x-pack/test/accessibility/apps/transform.ts @elastic/ml-ui
130-
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
131-
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
132-
135+
/x-pack/test/api_integration/apis/transform/ @elastic/ml-ui
133136
/x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui
137+
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
138+
/x-pack/test/functional/services/transform/ @elastic/ml-ui
134139
/x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
135140

136141
# Maps
@@ -158,6 +163,7 @@
158163
/packages/kbn-ui-shared-deps/ @elastic/kibana-operations
159164
/packages/kbn-es-archiver/ @elastic/kibana-operations
160165
/packages/kbn-utils/ @elastic/kibana-operations
166+
/packages/kbn-cli-dev-mode/ @elastic/kibana-operations
161167
/src/cli/keystore/ @elastic/kibana-operations
162168
/src/legacy/server/warnings/ @elastic/kibana-operations
163169
/.ci/es-snapshots/ @elastic/kibana-operations
@@ -194,6 +200,8 @@
194200
/packages/kbn-config/ @elastic/kibana-core
195201
/packages/kbn-logging/ @elastic/kibana-core
196202
/packages/kbn-legacy-logging/ @elastic/kibana-core
203+
/packages/kbn-crypto/ @elastic/kibana-core
204+
/packages/kbn-http-tools/ @elastic/kibana-core
197205
/src/legacy/server/config/ @elastic/kibana-core
198206
/src/legacy/server/http/ @elastic/kibana-core
199207
/src/legacy/server/logging/ @elastic/kibana-core

api_docs/alerting.json

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@
810810
"description": [],
811811
"source": {
812812
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
813-
"lineNumber": 132
813+
"lineNumber": 133
814814
}
815815
},
816816
{
@@ -821,7 +821,7 @@
821821
"description": [],
822822
"source": {
823823
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
824-
"lineNumber": 133
824+
"lineNumber": 134
825825
}
826826
},
827827
{
@@ -832,7 +832,7 @@
832832
"description": [],
833833
"source": {
834834
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
835-
"lineNumber": 134
835+
"lineNumber": 135
836836
}
837837
},
838838
{
@@ -843,7 +843,7 @@
843843
"description": [],
844844
"source": {
845845
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
846-
"lineNumber": 135
846+
"lineNumber": 136
847847
},
848848
"signature": [
849849
"Pick<",
@@ -860,7 +860,7 @@
860860
],
861861
"source": {
862862
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
863-
"lineNumber": 131
863+
"lineNumber": 132
864864
},
865865
"initialIsOpen": false
866866
},
@@ -905,21 +905,21 @@
905905
"description": [],
906906
"source": {
907907
"path": "x-pack/plugins/alerting/server/plugin.ts",
908-
"lineNumber": 111
908+
"lineNumber": 93
909909
}
910910
}
911911
],
912912
"tags": [],
913913
"returnComment": [],
914914
"source": {
915915
"path": "x-pack/plugins/alerting/server/plugin.ts",
916-
"lineNumber": 103
916+
"lineNumber": 85
917917
}
918918
}
919919
],
920920
"source": {
921921
"path": "x-pack/plugins/alerting/server/plugin.ts",
922-
"lineNumber": 102
922+
"lineNumber": 84
923923
},
924924
"initialIsOpen": false
925925
},
@@ -938,7 +938,7 @@
938938
"description": [],
939939
"source": {
940940
"path": "x-pack/plugins/alerting/server/plugin.ts",
941-
"lineNumber": 123
941+
"lineNumber": 105
942942
},
943943
"signature": [
944944
"() => Set<",
@@ -994,15 +994,15 @@
994994
"description": [],
995995
"source": {
996996
"path": "x-pack/plugins/alerting/server/plugin.ts",
997-
"lineNumber": 124
997+
"lineNumber": 106
998998
}
999999
}
10001000
],
10011001
"tags": [],
10021002
"returnComment": [],
10031003
"source": {
10041004
"path": "x-pack/plugins/alerting/server/plugin.ts",
1005-
"lineNumber": 124
1005+
"lineNumber": 106
10061006
}
10071007
},
10081008
{
@@ -1013,7 +1013,7 @@
10131013
"description": [],
10141014
"source": {
10151015
"path": "x-pack/plugins/alerting/server/plugin.ts",
1016-
"lineNumber": 125
1016+
"lineNumber": 107
10171017
},
10181018
"signature": [
10191019
"() => Promise<",
@@ -1030,7 +1030,7 @@
10301030
],
10311031
"source": {
10321032
"path": "x-pack/plugins/alerting/server/plugin.ts",
1033-
"lineNumber": 122
1033+
"lineNumber": 104
10341034
},
10351035
"initialIsOpen": false
10361036
}
@@ -1118,15 +1118,15 @@
11181118
},
11191119
"<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"muteAll\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"mutedInstanceIds\" | \"executionStatus\">>; delete: ({ id }: { id: string; }) => Promise<{}>; create: <Params extends Record<string, unknown> = never>({ data, options, }: ",
11201120
"CreateOptions",
1121-
"<Params>) => Promise<",
1121+
"<Params>) => Promise<Pick<",
11221122
{
11231123
"pluginId": "alerting",
11241124
"scope": "common",
11251125
"docId": "kibAlertingPluginApi",
11261126
"section": "def-common.Alert",
11271127
"text": "Alert"
11281128
},
1129-
"<Params>>; find: <Params>({ options: { fields, ...options }, }?: { options?: ",
1129+
"<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"muteAll\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"mutedInstanceIds\" | \"executionStatus\">>; find: <Params>({ options: { fields, ...options }, }?: { options?: ",
11301130
"FindOptions",
11311131
" | undefined; }) => Promise<",
11321132
{
@@ -2922,7 +2922,7 @@
29222922
"description": [],
29232923
"source": {
29242924
"path": "x-pack/plugins/alerting/common/index.ts",
2925-
"lineNumber": 28
2925+
"lineNumber": 30
29262926
},
29272927
"signature": [
29282928
"\"alerts\""
@@ -3006,16 +3006,16 @@
30063006
},
30073007
{
30083008
"tags": [],
3009-
"id": "def-common.BASE_ALERT_API_PATH",
3009+
"id": "def-common.BASE_ALERTING_API_PATH",
30103010
"type": "string",
3011-
"label": "BASE_ALERT_API_PATH",
3011+
"label": "BASE_ALERTING_API_PATH",
30123012
"description": [],
30133013
"source": {
30143014
"path": "x-pack/plugins/alerting/common/index.ts",
3015-
"lineNumber": 27
3015+
"lineNumber": 28
30163016
},
30173017
"signature": [
3018-
"\"/api/alerts\""
3018+
"\"/api/alerting\""
30193019
],
30203020
"initialIsOpen": false
30213021
},
@@ -3034,6 +3034,36 @@
30343034
],
30353035
"initialIsOpen": false
30363036
},
3037+
{
3038+
"tags": [],
3039+
"id": "def-common.INTERNAL_BASE_ALERTING_API_PATH",
3040+
"type": "string",
3041+
"label": "INTERNAL_BASE_ALERTING_API_PATH",
3042+
"description": [],
3043+
"source": {
3044+
"path": "x-pack/plugins/alerting/common/index.ts",
3045+
"lineNumber": 29
3046+
},
3047+
"signature": [
3048+
"\"/internal/alerting\""
3049+
],
3050+
"initialIsOpen": false
3051+
},
3052+
{
3053+
"tags": [],
3054+
"id": "def-common.LEGACY_BASE_ALERT_API_PATH",
3055+
"type": "string",
3056+
"label": "LEGACY_BASE_ALERT_API_PATH",
3057+
"description": [],
3058+
"source": {
3059+
"path": "x-pack/plugins/alerting/common/index.ts",
3060+
"lineNumber": 27
3061+
},
3062+
"signature": [
3063+
"\"/api/alerts\""
3064+
],
3065+
"initialIsOpen": false
3066+
},
30373067
{
30383068
"id": "def-common.RawAlertInstance",
30393069
"type": "Type",

api_docs/apm.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@
747747
"text": "APMEventESSearchRequest"
748748
},
749749
">(params: TParams, { includeLegacyData }?: { includeLegacyData?: boolean | undefined; }): Promise<",
750-
"ESSearchResponse",
750+
"InferSearchResponseOf",
751751
"<TypeOfProcessorEvent<",
752752
"ValuesType"
753753
]

api_docs/console.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"lineNumber": 18
4747
},
4848
"signature": [
49-
"{ addProcessorDefinition: (processor: any) => void; }"
49+
"{ addProcessorDefinition: (processor: unknown) => void; }"
5050
],
5151
"lifecycle": "start",
5252
"initialIsOpen": true

0 commit comments

Comments
 (0)