Skip to content

Commit ea2d163

Browse files
committed
merge with master
2 parents 14cdf38 + 9a3c508 commit ea2d163

File tree

1,782 files changed

+56359
-17387
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,782 files changed

+56359
-17387
lines changed

.ci/es-snapshots/Jenkinsfile_verify_es

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ kibanaPipeline(timeoutMinutes: 210) {
4242
}
4343

4444
task {
45-
kibanaPipeline.buildXpack(10)
45+
kibanaPipeline.buildXpack(10, true)
4646
tasks.xpackCiGroups()
47+
tasks.xpackCiGroupDocker()
4748
}
4849
}
4950
}

.ci/jobs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ JOB:
3333
- x-pack-ciGroup11
3434
- x-pack-ciGroup12
3535
- x-pack-ciGroup13
36+
- x-pack-ciGroupDocker
3637
- x-pack-accessibility
3738
- x-pack-visualRegression
3839

.eslintrc.js

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,6 +1114,118 @@ module.exports = {
11141114
'prefer-destructuring': 'error',
11151115
},
11161116
},
1117+
/**
1118+
* Metrics entities overrides
1119+
*/
1120+
{
1121+
// front end and common typescript and javascript files only
1122+
files: [
1123+
'x-pack/plugins/metrics_entities/public/**/*.{js,mjs,ts,tsx}',
1124+
'x-pack/plugins/metrics_entities/common/**/*.{js,mjs,ts,tsx}',
1125+
],
1126+
rules: {
1127+
'import/no-nodejs-modules': 'error',
1128+
'no-restricted-imports': [
1129+
'error',
1130+
{
1131+
// prevents UI code from importing server side code and then webpack including it when doing builds
1132+
patterns: ['**/server/*'],
1133+
},
1134+
],
1135+
},
1136+
},
1137+
{
1138+
// typescript and javascript for front and back end
1139+
files: ['x-pack/plugins/metrics_entities/**/*.{js,mjs,ts,tsx}'],
1140+
plugins: ['eslint-plugin-node'],
1141+
env: {
1142+
jest: true,
1143+
},
1144+
rules: {
1145+
'accessor-pairs': 'error',
1146+
'array-callback-return': 'error',
1147+
'no-array-constructor': 'error',
1148+
complexity: 'error',
1149+
'consistent-return': 'error',
1150+
'func-style': ['error', 'expression'],
1151+
'import/order': [
1152+
'error',
1153+
{
1154+
groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
1155+
'newlines-between': 'always',
1156+
},
1157+
],
1158+
'sort-imports': [
1159+
'error',
1160+
{
1161+
ignoreDeclarationSort: true,
1162+
},
1163+
],
1164+
'node/no-deprecated-api': 'error',
1165+
'no-bitwise': 'error',
1166+
'no-continue': 'error',
1167+
'no-dupe-keys': 'error',
1168+
'no-duplicate-case': 'error',
1169+
'no-duplicate-imports': 'error',
1170+
'no-empty-character-class': 'error',
1171+
'no-empty-pattern': 'error',
1172+
'no-ex-assign': 'error',
1173+
'no-extend-native': 'error',
1174+
'no-extra-bind': 'error',
1175+
'no-extra-boolean-cast': 'error',
1176+
'no-extra-label': 'error',
1177+
'no-func-assign': 'error',
1178+
'no-implicit-globals': 'error',
1179+
'no-implied-eval': 'error',
1180+
'no-invalid-regexp': 'error',
1181+
'no-inner-declarations': 'error',
1182+
'no-lone-blocks': 'error',
1183+
'no-multi-assign': 'error',
1184+
'no-misleading-character-class': 'error',
1185+
'no-new-symbol': 'error',
1186+
'no-obj-calls': 'error',
1187+
'no-param-reassign': ['error', { props: true }],
1188+
'no-process-exit': 'error',
1189+
'no-prototype-builtins': 'error',
1190+
'no-return-await': 'error',
1191+
'no-self-compare': 'error',
1192+
'no-shadow-restricted-names': 'error',
1193+
'no-sparse-arrays': 'error',
1194+
'no-this-before-super': 'error',
1195+
// rely on typescript
1196+
'no-undef': 'off',
1197+
'no-unreachable': 'error',
1198+
'no-unsafe-finally': 'error',
1199+
'no-useless-call': 'error',
1200+
'no-useless-catch': 'error',
1201+
'no-useless-concat': 'error',
1202+
'no-useless-computed-key': 'error',
1203+
'no-useless-escape': 'error',
1204+
'no-useless-rename': 'error',
1205+
'no-useless-return': 'error',
1206+
'no-void': 'error',
1207+
'one-var-declaration-per-line': 'error',
1208+
'prefer-object-spread': 'error',
1209+
'prefer-promise-reject-errors': 'error',
1210+
'prefer-rest-params': 'error',
1211+
'prefer-spread': 'error',
1212+
'prefer-template': 'error',
1213+
'require-atomic-updates': 'error',
1214+
'symbol-description': 'error',
1215+
'vars-on-top': 'error',
1216+
'@typescript-eslint/explicit-member-accessibility': 'error',
1217+
'@typescript-eslint/no-this-alias': 'error',
1218+
'@typescript-eslint/no-explicit-any': 'error',
1219+
'@typescript-eslint/no-useless-constructor': 'error',
1220+
'@typescript-eslint/unified-signatures': 'error',
1221+
'@typescript-eslint/explicit-function-return-type': 'error',
1222+
'@typescript-eslint/no-non-null-assertion': 'error',
1223+
'@typescript-eslint/no-unused-vars': 'error',
1224+
'no-template-curly-in-string': 'error',
1225+
'sort-keys': 'error',
1226+
'prefer-destructuring': 'error',
1227+
},
1228+
},
11171229
/**
11181230
* Alerting Services overrides
11191231
*/
@@ -1144,6 +1256,22 @@ module.exports = {
11441256
},
11451257
},
11461258

1259+
/**
1260+
* Discover overrides
1261+
*/
1262+
{
1263+
files: ['src/plugins/discover/**/*.{ts,tsx}'],
1264+
rules: {
1265+
'@typescript-eslint/no-explicit-any': 'error',
1266+
'@typescript-eslint/ban-ts-comment': [
1267+
'error',
1268+
{
1269+
'ts-expect-error': false,
1270+
},
1271+
],
1272+
},
1273+
},
1274+
11471275
/**
11481276
* Enterprise Search overrides
11491277
* NOTE: We also have a single rule at the bottom of the file that

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
exports_files(
44
[
55
"tsconfig.base.json",
6+
"tsconfig.browser.json",
67
"tsconfig.json",
78
"package.json"
89
],

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kibanaLibrary.load()
66
kibanaPipeline(timeoutMinutes: 210, checkPrChanges: true, setCommitStatus: true) {
77
slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
88
githubPr.withDefaultPrComments {
9-
ciStats.trackBuild {
9+
ciStats.trackBuild(requireSuccess: githubPr.isPr()) {
1010
catchError {
1111
retryable.enable()
1212
kibanaPipeline.allCiTasks()

WORKSPACE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1010
# Fetch Node.js rules
1111
http_archive(
1212
name = "build_bazel_rules_nodejs",
13-
sha256 = "dd7ea7efda7655c218ca707f55c3e1b9c68055a70c31a98f264b3445bc8f4cb1",
14-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.3/rules_nodejs-3.2.3.tar.gz"],
13+
sha256 = "65067dcad93a61deb593be7d3d9a32a4577d09665536d8da536d731da5cd15e2",
14+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.4.2/rules_nodejs-3.4.2.tar.gz"],
1515
)
1616

1717
# Now that we have the rules let's import from them to complete the work
1818
load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
1919

2020
# Assure we have at least a given rules_nodejs version
21-
check_rules_nodejs_version(minimum_version_string = "3.2.3")
21+
check_rules_nodejs_version(minimum_version_string = "3.4.2")
2222

2323
# Setup the Node.js toolchain for the architectures we want to support
2424
#

api_docs/metrics_entities.json

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
{
2+
"id": "metricsEntities",
3+
"client": {
4+
"classes": [],
5+
"functions": [],
6+
"interfaces": [],
7+
"enums": [],
8+
"misc": [],
9+
"objects": []
10+
},
11+
"server": {
12+
"classes": [],
13+
"functions": [],
14+
"interfaces": [],
15+
"enums": [],
16+
"misc": [],
17+
"objects": [],
18+
"setup": {
19+
"id": "def-server.MetricsEntitiesPluginSetup",
20+
"type": "Interface",
21+
"label": "MetricsEntitiesPluginSetup",
22+
"description": [],
23+
"tags": [],
24+
"children": [
25+
{
26+
"tags": [],
27+
"id": "def-server.MetricsEntitiesPluginSetup.getMetricsEntitiesClient",
28+
"type": "Function",
29+
"label": "getMetricsEntitiesClient",
30+
"description": [],
31+
"source": {
32+
"path": "x-pack/plugins/metrics_entities/server/types.ts",
33+
"lineNumber": 15
34+
},
35+
"signature": [
36+
"GetMetricsEntitiesClientType"
37+
]
38+
}
39+
],
40+
"source": {
41+
"path": "x-pack/plugins/metrics_entities/server/types.ts",
42+
"lineNumber": 14
43+
},
44+
"lifecycle": "setup",
45+
"initialIsOpen": true
46+
},
47+
"start": {
48+
"id": "def-server.MetricsEntitiesPluginStart",
49+
"type": "Type",
50+
"label": "MetricsEntitiesPluginStart",
51+
"tags": [],
52+
"description": [],
53+
"source": {
54+
"path": "x-pack/plugins/metrics_entities/server/types.ts",
55+
"lineNumber": 18
56+
},
57+
"signature": [
58+
"void"
59+
],
60+
"lifecycle": "start",
61+
"initialIsOpen": true
62+
}
63+
},
64+
"common": {
65+
"classes": [],
66+
"functions": [],
67+
"interfaces": [],
68+
"enums": [],
69+
"misc": [
70+
{
71+
"tags": [],
72+
"id": "def-common.ELASTIC_NAME",
73+
"type": "string",
74+
"label": "ELASTIC_NAME",
75+
"description": [
76+
"\nGlobal prefix for all the transform jobs"
77+
],
78+
"source": {
79+
"path": "x-pack/plugins/metrics_entities/common/constants.ts",
80+
"lineNumber": 21
81+
},
82+
"signature": [
83+
"\"estc\""
84+
],
85+
"initialIsOpen": false
86+
},
87+
{
88+
"tags": [],
89+
"id": "def-common.METRICS_ENTITIES_TRANSFORMS",
90+
"type": "string",
91+
"label": "METRICS_ENTITIES_TRANSFORMS",
92+
"description": [
93+
"\nTransforms route"
94+
],
95+
"source": {
96+
"path": "x-pack/plugins/metrics_entities/common/constants.ts",
97+
"lineNumber": 16
98+
},
99+
"initialIsOpen": false
100+
},
101+
{
102+
"tags": [],
103+
"id": "def-common.METRICS_ENTITIES_URL",
104+
"type": "string",
105+
"label": "METRICS_ENTITIES_URL",
106+
"description": [
107+
"\nBase route"
108+
],
109+
"source": {
110+
"path": "x-pack/plugins/metrics_entities/common/constants.ts",
111+
"lineNumber": 11
112+
},
113+
"signature": [
114+
"\"/api/metrics_entities\""
115+
],
116+
"initialIsOpen": false
117+
},
118+
{
119+
"tags": [],
120+
"id": "def-common.PLUGIN_ID",
121+
"type": "string",
122+
"label": "PLUGIN_ID",
123+
"description": [],
124+
"source": {
125+
"path": "x-pack/plugins/metrics_entities/common/index.ts",
126+
"lineNumber": 8
127+
},
128+
"signature": [
129+
"\"metricsEntities\""
130+
],
131+
"initialIsOpen": false
132+
},
133+
{
134+
"tags": [],
135+
"id": "def-common.PLUGIN_NAME",
136+
"type": "string",
137+
"label": "PLUGIN_NAME",
138+
"description": [],
139+
"source": {
140+
"path": "x-pack/plugins/metrics_entities/common/index.ts",
141+
"lineNumber": 9
142+
},
143+
"signature": [
144+
"\"metrics_entities\""
145+
],
146+
"initialIsOpen": false
147+
}
148+
],
149+
"objects": []
150+
}
151+
}

api_docs/metrics_entities.mdx

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
id: kibMetricsEntitiesPluginApi
3+
slug: /kibana-dev-docs/metricsEntitiesPluginApi
4+
title: metricsEntities
5+
image: https://source.unsplash.com/400x175/?github
6+
summary: API docs for the metricsEntities plugin
7+
date: 2020-11-16
8+
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'metricsEntities']
9+
warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
10+
---
11+
12+
import metricsEntitiesObj from './metrics_entities.json';
13+
14+
## Server
15+
16+
### Setup
17+
<DocDefinitionList data={[metricsEntitiesObj.server.setup]}/>
18+
19+
### Start
20+
<DocDefinitionList data={[metricsEntitiesObj.server.start]}/>
21+
22+
## Common
23+
24+
### Consts, variables and types
25+
<DocDefinitionList data={metricsEntitiesObj.common.misc}/>
26+

0 commit comments

Comments
 (0)