Skip to content

Commit 3d02738

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into migrations/add-test-harness
2 parents 533bd88 + eaa6dcb commit 3d02738

File tree

1,826 files changed

+38664
-20462
lines changed

Some content is hidden

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

1,826 files changed

+38664
-20462
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ module.exports = {
446446
'!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
447447
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
448448
'!(src|x-pack)/plugins/**/__stories__/index.{js,mjs,ts,tsx}',
449+
'!(src|x-pack)/plugins/**/__fixtures__/index.{js,mjs,ts,tsx}',
449450
],
450451
allowSameFolder: true,
451452
errorMessage: 'Plugins may only import from top-level public and server modules.',

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,14 @@
249249
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core
250250

251251
# Security
252-
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
252+
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
253253
/src/plugins/security_oss/ @elastic/kibana-security
254254
/src/plugins/spaces_oss/ @elastic/kibana-security
255255
/src/plugins/user_setup/ @elastic/kibana-security
256256
/test/security_functional/ @elastic/kibana-security
257-
/x-pack/plugins/spaces/ @elastic/kibana-security
258-
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
259-
/x-pack/plugins/security/ @elastic/kibana-security
257+
/x-pack/plugins/spaces/ @elastic/kibana-security
258+
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
259+
/x-pack/plugins/security/ @elastic/kibana-security
260260
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
261261
/x-pack/test/ui_capabilities/ @elastic/kibana-security
262262
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
@@ -265,6 +265,8 @@
265265
/x-pack/test/security_functional/ @elastic/kibana-security
266266
/x-pack/test/spaces_api_integration/ @elastic/kibana-security
267267
/x-pack/test/saved_object_api_integration/ @elastic/kibana-security
268+
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
269+
/examples/preboot_example/ @elastic/kibana-security @elastic/kibana-core
268270
#CC# /x-pack/plugins/security/ @elastic/kibana-security
269271

270272
# Kibana Alerting Services

‎.i18nrc.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"expressions": "src/plugins/expressions",
1919
"expressionError": "src/plugins/expression_error",
2020
"expressionRevealImage": "src/plugins/expression_reveal_image",
21+
"expressionShape": "src/plugins/expression_shape",
2122
"inputControl": "src/plugins/input_control_vis",
2223
"inspector": "src/plugins/inspector",
2324
"inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -28,6 +29,7 @@
2829
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
2930
"maps_legacy": "src/plugins/maps_legacy",
3031
"monaco": "packages/kbn-monaco/src",
32+
"esQuery": "packages/kbn-es-query/src",
3133
"presentationUtil": "src/plugins/presentation_util",
3234
"indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
3335
"indexPatternManagement": "src/plugins/index_pattern_management",

‎api_docs/alerting.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -669,19 +669,19 @@
669669
"children": [
670670
{
671671
"parentPluginId": "alerting",
672-
"id": "def-server.AlertingApiRequestHandlerContext.getAlertsClient",
672+
"id": "def-server.AlertingApiRequestHandlerContext.getRulesClient",
673673
"type": "Function",
674674
"tags": [],
675-
"label": "getAlertsClient",
675+
"label": "getRulesClient",
676676
"description": [],
677677
"signature": [
678678
"() => ",
679679
{
680680
"pluginId": "alerting",
681681
"scope": "server",
682682
"docId": "kibAlertingPluginApi",
683-
"section": "def-server.AlertsClient",
684-
"text": "AlertsClient"
683+
"section": "def-server.RulesClient",
684+
"text": "RulesClient"
685685
}
686686
],
687687
"source": {
@@ -1170,7 +1170,7 @@
11701170
"<Params>"
11711171
],
11721172
"source": {
1173-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1173+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
11741174
"lineNumber": 140
11751175
},
11761176
"deprecated": false,
@@ -1183,7 +1183,7 @@
11831183
"label": "page",
11841184
"description": [],
11851185
"source": {
1186-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1186+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
11871187
"lineNumber": 141
11881188
},
11891189
"deprecated": false
@@ -1196,7 +1196,7 @@
11961196
"label": "perPage",
11971197
"description": [],
11981198
"source": {
1199-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1199+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
12001200
"lineNumber": 142
12011201
},
12021202
"deprecated": false
@@ -1209,7 +1209,7 @@
12091209
"label": "total",
12101210
"description": [],
12111211
"source": {
1212-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1212+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
12131213
"lineNumber": 143
12141214
},
12151215
"deprecated": false
@@ -1233,7 +1233,7 @@
12331233
"<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
12341234
],
12351235
"source": {
1236-
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
1236+
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
12371237
"lineNumber": 144
12381238
},
12391239
"deprecated": false
@@ -1343,10 +1343,10 @@
13431343
},
13441344
{
13451345
"parentPluginId": "alerting",
1346-
"id": "def-server.PluginStartContract.getAlertsClientWithRequest",
1346+
"id": "def-server.PluginStartContract.getRulesClientWithRequest",
13471347
"type": "Function",
13481348
"tags": [],
1349-
"label": "getAlertsClientWithRequest",
1349+
"label": "getRulesClientWithRequest",
13501350
"description": [],
13511351
"signature": [
13521352
"(request: ",
@@ -1362,8 +1362,8 @@
13621362
"pluginId": "alerting",
13631363
"scope": "server",
13641364
"docId": "kibAlertingPluginApi",
1365-
"section": "def-server.AlertsClient",
1366-
"text": "AlertsClient"
1365+
"section": "def-server.RulesClient",
1366+
"text": "RulesClient"
13671367
},
13681368
", \"get\" | \"delete\" | \"create\" | \"find\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\">"
13691369
],
@@ -1375,7 +1375,7 @@
13751375
"children": [
13761376
{
13771377
"parentPluginId": "alerting",
1378-
"id": "def-server.PluginStartContract.getAlertsClientWithRequest.$1",
1378+
"id": "def-server.PluginStartContract.getRulesClientWithRequest.$1",
13791379
"type": "Object",
13801380
"tags": [],
13811381
"label": "request",
@@ -1571,10 +1571,10 @@
15711571
},
15721572
{
15731573
"parentPluginId": "alerting",
1574-
"id": "def-server.AlertsClient",
1574+
"id": "def-server.RulesClient",
15751575
"type": "Type",
15761576
"tags": [],
1577-
"label": "AlertsClient",
1577+
"label": "RulesClient",
15781578
"description": [],
15791579
"signature": [
15801580
"{ get: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<Pick<",

‎api_docs/deprecations.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
2626
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L8) | - |
2727
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L21) | - |
2828
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L23) | - |
29-
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L23) | - |
30-
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L98) | - |
29+
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L23) | - |
30+
| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L98) | - |
3131

3232

3333

‎api_docs/security.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,14 +1739,14 @@
17391739
{
17401740
"plugin": "alerting",
17411741
"link": {
1742-
"path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
1742+
"path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
17431743
"lineNumber": 23
17441744
}
17451745
},
17461746
{
17471747
"plugin": "alerting",
17481748
"link": {
1749-
"path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
1749+
"path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
17501750
"lineNumber": 98
17511751
}
17521752
}

0 commit comments

Comments
 (0)