Skip to content

Commit 8cf6680

Browse files
mattkimemattkime
committed
Merge branch 'master' into index_pattern_field_editor_example_app
2 parents 6193ced + aa2f5b5 commit 8cf6680

1,834 files changed

Lines changed: 130134 additions & 64908 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/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.16.1
4+
ARG NODE_VERSION=14.17.0
55

66
FROM node:${NODE_VERSION} AS base
77

‎.eslintrc.js‎

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,33 @@ module.exports = {
711711
name: 'lodash/fp/assocPath',
712712
message: 'Please use @elastic/safer-lodash-set instead',
713713
},
714+
{
715+
name: 'lodash',
716+
importNames: ['template'],
717+
message:
718+
'lodash.template is unsafe, and not compatible with our content security policy.',
719+
},
720+
{
721+
name: 'lodash.template',
722+
message:
723+
'lodash.template is unsafe, and not compatible with our content security policy.',
724+
},
725+
{
726+
name: 'lodash/template',
727+
message:
728+
'lodash.template is unsafe, and not compatible with our content security policy.',
729+
},
730+
{
731+
name: 'lodash/fp',
732+
importNames: ['template'],
733+
message:
734+
'lodash.template is unsafe, and not compatible with our content security policy.',
735+
},
736+
{
737+
name: 'lodash/fp/template',
738+
message:
739+
'lodash.template is unsafe, and not compatible with our content security policy.',
740+
},
714741
{
715742
name: 'react-use',
716743
message: 'Please use react-use/lib/{method} instead.',
@@ -730,6 +757,11 @@ module.exports = {
730757
name: 'lodash.setwith',
731758
message: 'Please use @elastic/safer-lodash-set instead',
732759
},
760+
{
761+
name: 'lodash.template',
762+
message:
763+
'lodash.template is unsafe, and not compatible with our content security policy.',
764+
},
733765
{
734766
name: 'lodash/set',
735767
message: 'Please use @elastic/safer-lodash-set instead',
@@ -738,6 +770,11 @@ module.exports = {
738770
name: 'lodash/setWith',
739771
message: 'Please use @elastic/safer-lodash-set instead',
740772
},
773+
{
774+
name: 'lodash/template',
775+
message:
776+
'lodash.template is unsafe, and not compatible with our content security policy.',
777+
},
741778
],
742779
},
743780
],
@@ -753,6 +790,18 @@ module.exports = {
753790
property: 'set',
754791
message: 'Please use @elastic/safer-lodash-set instead',
755792
},
793+
{
794+
object: 'lodash',
795+
property: 'template',
796+
message:
797+
'lodash.template is unsafe, and not compatible with our content security policy.',
798+
},
799+
{
800+
object: '_',
801+
property: 'template',
802+
message:
803+
'lodash.template is unsafe, and not compatible with our content security policy.',
804+
},
756805
{
757806
object: 'lodash',
758807
property: 'setWith',
@@ -1576,20 +1625,5 @@ module.exports = {
15761625
'@typescript-eslint/prefer-ts-expect-error': 'error',
15771626
},
15781627
},
1579-
{
1580-
files: [
1581-
'**/public/**/*.{js,mjs,ts,tsx}',
1582-
'**/common/**/*.{js,mjs,ts,tsx}',
1583-
'packages/**/*.{js,mjs,ts,tsx}',
1584-
],
1585-
rules: {
1586-
'no-restricted-imports': [
1587-
'error',
1588-
{
1589-
patterns: ['lodash/*', '!lodash/fp', 'rxjs/internal-compatibility'],
1590-
},
1591-
],
1592-
},
1593-
},
15941628
],
15951629
};

‎.i18nrc.json‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
"interpreter": "src/legacy/core_plugins/interpreter",
2323
"kbn": "src/legacy/core_plugins/kibana",
2424
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
25-
"management": [
26-
"src/legacy/core_plugins/management",
27-
"src/plugins/management"
28-
],
25+
"lists": "packages/kbn-securitysolution-list-utils/src",
26+
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
2927
"maps_legacy": "src/plugins/maps_legacy",
3028
"monaco": "packages/kbn-monaco/src",
3129
"presentationUtil": "src/plugins/presentation_util",
@@ -45,10 +43,7 @@
4543
"security": "src/plugins/security_oss",
4644
"server": "src/legacy/server",
4745
"statusPage": "src/legacy/core_plugins/status_page",
48-
"telemetry": [
49-
"src/plugins/telemetry",
50-
"src/plugins/telemetry_management_section"
51-
],
46+
"telemetry": ["src/plugins/telemetry", "src/plugins/telemetry_management_section"],
5247
"tileMap": "src/plugins/tile_map",
5348
"timelion": ["src/plugins/timelion", "src/plugins/vis_type_timelion"],
5449
"uiActions": "src/plugins/ui_actions",
@@ -66,8 +61,6 @@
6661
"apmOss": "src/plugins/apm_oss",
6762
"usageCollection": "src/plugins/usage_collection"
6863
},
69-
"exclude": [
70-
"src/legacy/ui/ui_render/ui_render_mixin.js"
71-
],
64+
"exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
7265
"translations": []
7366
}

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.1
1+
14.17.0

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.1
1+
14.17.0

‎WORKSPACE.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.5.0")
2727
# we can update that rule.
2828
node_repositories(
2929
node_repositories = {
30-
"14.16.1-darwin_amd64": ("node-v14.16.1-darwin-x64.tar.gz", "node-v14.16.1-darwin-x64", "b762b72fc149629b7e394ea9b75a093cad709a9f2f71480942945d8da0fc1218"),
31-
"14.16.1-linux_arm64": ("node-v14.16.1-linux-arm64.tar.xz", "node-v14.16.1-linux-arm64", "b4d474e79f7d33b3b4430fad25c3f836b82ce2d5bb30d4a2c9fa20df027e40da"),
32-
"14.16.1-linux_s390x": ("node-v14.16.1-linux-s390x.tar.xz", "node-v14.16.1-linux-s390x", "af9982fef32e4a3e4a5d66741dcf30ac9c27613bd73582fa1dae1fb25003047a"),
33-
"14.16.1-linux_amd64": ("node-v14.16.1-linux-x64.tar.xz", "node-v14.16.1-linux-x64", "85a89d2f68855282c87851c882d4c4bbea4cd7f888f603722f0240a6e53d89df"),
34-
"14.16.1-windows_amd64": ("node-v14.16.1-win-x64.zip", "node-v14.16.1-win-x64", "e469db37b4df74627842d809566c651042d86f0e6006688f0f5fe3532c6dfa41"),
30+
"14.17.0-darwin_amd64": ("node-v14.17.0-darwin-x64.tar.gz", "node-v14.17.0-darwin-x64", "7b210652e11d1ee25650c164cf32381895e1dcb3e0ff1d0841d8abc1f47ac73e"),
31+
"14.17.0-linux_arm64": ("node-v14.17.0-linux-arm64.tar.xz", "node-v14.17.0-linux-arm64", "712e5575cee20570a0a56f4d4b4572cb0f2ee2f4bce49433de18be0393e7df22"),
32+
"14.17.0-linux_s390x": ("node-v14.17.0-linux-s390x.tar.xz", "node-v14.17.0-linux-s390x", "6419372b9e9ad37e0bce188dc5740f2f060aaa44454418e462b4088a310a1c0b"),
33+
"14.17.0-linux_amd64": ("node-v14.17.0-linux-x64.tar.xz", "node-v14.17.0-linux-x64", "494b161759a3d19c70e3172d33ce1918dd8df9ad20d29d1652a8387a84e2d308"),
34+
"14.17.0-windows_amd64": ("node-v14.17.0-win-x64.zip", "node-v14.17.0-win-x64", "6582a7259c433e9f667dcc4ed3e5d68bc514caba2eed40e4626c8b4c7e5ecd5c"),
3535
},
36-
node_version = "14.16.1",
36+
node_version = "14.17.0",
3737
node_urls = [
3838
"https://nodejs.org/dist/v{version}/{filename}",
3939
],

‎api_docs/actions.json‎

Lines changed: 85 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@
252252
"path": "x-pack/plugins/actions/server/types.ts",
253253
"lineNumber": 40
254254
},
255-
"deprecated": false
255+
"deprecated": false,
256+
"returnComment": [],
257+
"children": []
256258
},
257259
{
258260
"parentPluginId": "actions",
@@ -276,7 +278,9 @@
276278
"path": "x-pack/plugins/actions/server/types.ts",
277279
"lineNumber": 41
278280
},
279-
"deprecated": false
281+
"deprecated": false,
282+
"returnComment": [],
283+
"children": []
280284
}
281285
],
282286
"initialIsOpen": false
@@ -516,14 +520,55 @@
516520
"label": "executor",
517521
"description": [],
518522
"signature": [
519-
"ExecutorType",
520-
"<Config, Secrets, Params, ExecutorResultData>"
523+
"(options: ",
524+
{
525+
"pluginId": "actions",
526+
"scope": "server",
527+
"docId": "kibActionsPluginApi",
528+
"section": "def-server.ActionTypeExecutorOptions",
529+
"text": "ActionTypeExecutorOptions"
530+
},
531+
"<Config, Secrets, Params>) => Promise<",
532+
{
533+
"pluginId": "actions",
534+
"scope": "common",
535+
"docId": "kibActionsPluginApi",
536+
"section": "def-common.ActionTypeExecutorResult",
537+
"text": "ActionTypeExecutorResult"
538+
},
539+
"<ExecutorResultData>>"
521540
],
522541
"source": {
523542
"path": "x-pack/plugins/actions/server/types.ts",
524543
"lineNumber": 116
525544
},
526-
"deprecated": false
545+
"deprecated": false,
546+
"returnComment": [],
547+
"children": [
548+
{
549+
"parentPluginId": "actions",
550+
"id": "def-server.options",
551+
"type": "Object",
552+
"tags": [],
553+
"label": "options",
554+
"description": [],
555+
"signature": [
556+
{
557+
"pluginId": "actions",
558+
"scope": "server",
559+
"docId": "kibActionsPluginApi",
560+
"section": "def-server.ActionTypeExecutorOptions",
561+
"text": "ActionTypeExecutorOptions"
562+
},
563+
"<Config, Secrets, Params>"
564+
],
565+
"source": {
566+
"path": "x-pack/plugins/actions/server/types.ts",
567+
"lineNumber": 84
568+
},
569+
"deprecated": false
570+
}
571+
]
527572
}
528573
],
529574
"initialIsOpen": false
@@ -743,7 +788,7 @@
743788
"label": "ActionParamsType",
744789
"description": [],
745790
"signature": [
746-
"{ readonly source?: string | undefined; readonly summary?: string | undefined; readonly timestamp?: string | undefined; readonly eventAction?: \"resolve\" | \"trigger\" | \"acknowledge\" | undefined; readonly dedupKey?: string | undefined; readonly severity?: \"warning\" | \"info\" | \"error\" | \"critical\" | undefined; readonly component?: string | undefined; readonly group?: string | undefined; readonly class?: string | undefined; }"
791+
"{ readonly source?: string | undefined; readonly summary?: string | undefined; readonly timestamp?: string | undefined; readonly eventAction?: \"resolve\" | \"trigger\" | \"acknowledge\" | undefined; readonly dedupKey?: string | undefined; readonly severity?: \"warning\" | \"error\" | \"info\" | \"critical\" | undefined; readonly component?: string | undefined; readonly group?: string | undefined; readonly class?: string | undefined; }"
747792
],
748793
"source": {
749794
"path": "x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts",
@@ -760,7 +805,7 @@
760805
"label": "ActionParamsType",
761806
"description": [],
762807
"signature": [
763-
"{ readonly message: string; readonly level: \"info\" | \"error\" | \"debug\" | \"trace\" | \"warn\" | \"fatal\"; }"
808+
"{ readonly message: string; readonly level: \"error\" | \"info\" | \"debug\" | \"trace\" | \"warn\" | \"fatal\"; }"
764809
],
765810
"source": {
766811
"path": "x-pack/plugins/actions/server/builtin_action_types/server_log.ts",
@@ -923,7 +968,38 @@
923968
"docId": "kibActionsPluginApi",
924969
"section": "def-server.ActionResult",
925970
"text": "ActionResult"
926-
}
971+
},
972+
"<Record<string, unknown>>>; execute: ({ actionId, params, source, }: Pick<",
973+
"ExecuteOptions",
974+
"<unknown>, \"source\" | \"params\" | \"actionId\">) => Promise<",
975+
{
976+
"pluginId": "actions",
977+
"scope": "common",
978+
"docId": "kibActionsPluginApi",
979+
"section": "def-common.ActionTypeExecutorResult",
980+
"text": "ActionTypeExecutorResult"
981+
},
982+
"<unknown>>; getAll: () => Promise<",
983+
"FindActionResult",
984+
"[]>; getBulk: (ids: string[]) => Promise<",
985+
{
986+
"pluginId": "actions",
987+
"scope": "server",
988+
"docId": "kibActionsPluginApi",
989+
"section": "def-server.ActionResult",
990+
"text": "ActionResult"
991+
},
992+
"<Record<string, unknown>>[]>; enqueueExecution: (options: ",
993+
"ExecuteOptions",
994+
") => Promise<void>; listTypes: () => Promise<",
995+
{
996+
"pluginId": "actions",
997+
"scope": "common",
998+
"docId": "kibActionsPluginApi",
999+
"section": "def-common.ActionType",
1000+
"text": "ActionType"
1001+
},
1002+
"[]>; isActionTypeEnabled: (actionTypeId: string, options?: { notifyUsage: boolean; }) => boolean; }"
9271003
],
9281004
"source": {
9291005
"path": "x-pack/plugins/actions/server/index.ts",
@@ -1719,7 +1795,7 @@
17191795
"label": "config",
17201796
"description": [],
17211797
"signature": [
1722-
"Record<string, any>"
1798+
"{ [x: string]: any; }"
17231799
],
17241800
"source": {
17251801
"path": "x-pack/plugins/actions/common/types.ts",

0 commit comments

Comments
 (0)