Skip to content

Commit

Permalink
Merge branch 'master' into versionField
Browse files Browse the repository at this point in the history
  • Loading branch information
@kibanamachine
kibanamachine authored Jul 22, 2021
2 parents f4a8931 + eaa6dcb commit a507fcf
Show file tree
Hide file tree
Showing 1,871 changed files with 39,599 additions and 20,776 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ module.exports = {
'!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
'!(src|x-pack)/plugins/**/__stories__/index.{js,mjs,ts,tsx}',
'!(src|x-pack)/plugins/**/__fixtures__/index.{js,mjs,ts,tsx}',
],
allowSameFolder: true,
errorMessage: 'Plugins may only import from top-level public and server modules.',
Expand Down
10 changes: 6 additions & 4 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,14 @@
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core

# Security
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
/src/plugins/security_oss/ @elastic/kibana-security
/src/plugins/spaces_oss/ @elastic/kibana-security
/src/plugins/user_setup/ @elastic/kibana-security
/test/security_functional/ @elastic/kibana-security
/x-pack/plugins/spaces/ @elastic/kibana-security
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
/x-pack/plugins/security/ @elastic/kibana-security
/x-pack/plugins/spaces/ @elastic/kibana-security
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
/x-pack/plugins/security/ @elastic/kibana-security
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
/x-pack/test/ui_capabilities/ @elastic/kibana-security
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
Expand All @@ -265,6 +265,8 @@
/x-pack/test/security_functional/ @elastic/kibana-security
/x-pack/test/spaces_api_integration/ @elastic/kibana-security
/x-pack/test/saved_object_api_integration/ @elastic/kibana-security
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
/examples/preboot_example/ @elastic/kibana-security @elastic/kibana-core
#CC# /x-pack/plugins/security/ @elastic/kibana-security

# Kibana Alerting Services
Expand Down
2 changes: 2 additions & 0 deletions .i18nrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"expressions": "src/plugins/expressions",
"expressionError": "src/plugins/expression_error",
"expressionRevealImage": "src/plugins/expression_reveal_image",
"expressionShape": "src/plugins/expression_shape",
"inputControl": "src/plugins/input_control_vis",
"inspector": "src/plugins/inspector",
"inspectorViews": "src/legacy/core_plugins/inspector_views",
Expand All @@ -28,6 +29,7 @@
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
"maps_legacy": "src/plugins/maps_legacy",
"monaco": "packages/kbn-monaco/src",
"esQuery": "packages/kbn-es-query/src",
"presentationUtil": "src/plugins/presentation_util",
"indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
"indexPatternManagement": "src/plugins/index_pattern_management",
Expand Down
32 changes: 16 additions & 16 deletions api_docs/alerting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,19 +669,19 @@
"children": [
{
"parentPluginId": "alerting",
"id": "def-server.AlertingApiRequestHandlerContext.getAlertsClient",
"id": "def-server.AlertingApiRequestHandlerContext.getRulesClient",
"type": "Function",
"tags": [],
"label": "getAlertsClient",
"label": "getRulesClient",
"description": [],
"signature": [
"() => ",
{
"pluginId": "alerting",
"scope": "server",
"docId": "kibAlertingPluginApi",
"section": "def-server.AlertsClient",
"text": "AlertsClient"
"section": "def-server.RulesClient",
"text": "RulesClient"
}
],
"source": {
Expand Down Expand Up @@ -1170,7 +1170,7 @@
"<Params>"
],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
"lineNumber": 140
},
"deprecated": false,
Expand All @@ -1183,7 +1183,7 @@
"label": "page",
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
"lineNumber": 141
},
"deprecated": false
Expand All @@ -1196,7 +1196,7 @@
"label": "perPage",
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
"lineNumber": 142
},
"deprecated": false
Expand All @@ -1209,7 +1209,7 @@
"label": "total",
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
"lineNumber": 143
},
"deprecated": false
Expand All @@ -1233,7 +1233,7 @@
"<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
"lineNumber": 144
},
"deprecated": false
Expand Down Expand Up @@ -1343,10 +1343,10 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.PluginStartContract.getAlertsClientWithRequest",
"id": "def-server.PluginStartContract.getRulesClientWithRequest",
"type": "Function",
"tags": [],
"label": "getAlertsClientWithRequest",
"label": "getRulesClientWithRequest",
"description": [],
"signature": [
"(request: ",
Expand All @@ -1362,8 +1362,8 @@
"pluginId": "alerting",
"scope": "server",
"docId": "kibAlertingPluginApi",
"section": "def-server.AlertsClient",
"text": "AlertsClient"
"section": "def-server.RulesClient",
"text": "RulesClient"
},
", \"get\" | \"delete\" | \"create\" | \"find\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\">"
],
Expand All @@ -1375,7 +1375,7 @@
"children": [
{
"parentPluginId": "alerting",
"id": "def-server.PluginStartContract.getAlertsClientWithRequest.$1",
"id": "def-server.PluginStartContract.getRulesClientWithRequest.$1",
"type": "Object",
"tags": [],
"label": "request",
Expand Down Expand Up @@ -1571,10 +1571,10 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.AlertsClient",
"id": "def-server.RulesClient",
"type": "Type",
"tags": [],
"label": "AlertsClient",
"label": "RulesClient",
"description": [],
"signature": [
"{ get: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<Pick<",
Expand Down
4 changes: 2 additions & 2 deletions api_docs/deprecations.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
| <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) | - |
| <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) | - |
| <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) | - |
| <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) | - |
| <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) | - |
| <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) | - |
| <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) | - |



Expand Down
4 changes: 2 additions & 2 deletions api_docs/security.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1739,14 +1739,14 @@
{
"plugin": "alerting",
"link": {
"path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
"path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
"lineNumber": 23
}
},
{
"plugin": "alerting",
"link": {
"path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
"path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
"lineNumber": 98
}
}
Expand Down
Loading

0 comments on commit a507fcf

Please sign in to comment.