Skip to content

Commit c44c628

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into application_usage/functiona-test-appIds-in-schema
2 parents 4ccc488 + f7fdda5 commit c44c628

515 files changed

Lines changed: 8175 additions & 5586 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/Jenkinsfile_flaky‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ kibanaLibrary.load()
55

66
def CI_GROUP_PARAM = params.CI_GROUP
77

8-
// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke', or 'all:serverMocha'
8+
// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke'
99
def JOB_PARTS = CI_GROUP_PARAM.split(':')
1010
def IS_XPACK = JOB_PARTS[0] == 'xpack'
1111
def JOB = JOB_PARTS[1]
12-
def NEED_BUILD = JOB != 'serverMocha'
1312
def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
1413
def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
1514
def AGENT_COUNT = getAgentCount(EXECUTIONS)
@@ -31,15 +30,13 @@ kibanaPipeline(timeoutMinutes: 180) {
3130
print "Agent ${agentNumberInside} - ${agentExecutions} executions"
3231

3332
workers.functional('flaky-test-runner', {
34-
if (NEED_BUILD) {
35-
if (!IS_XPACK) {
36-
kibanaPipeline.buildOss()
37-
if (CI_GROUP == '1') {
38-
runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
39-
}
40-
} else {
41-
kibanaPipeline.buildXpack()
33+
if (!IS_XPACK) {
34+
kibanaPipeline.buildOss()
35+
if (CI_GROUP == '1') {
36+
runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
4237
}
38+
} else {
39+
kibanaPipeline.buildXpack()
4340
}
4441
}, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
4542
}
@@ -60,17 +57,7 @@ kibanaPipeline(timeoutMinutes: 180) {
6057

6158
def getWorkerFromParams(isXpack, job, ciGroup) {
6259
if (!isXpack) {
63-
if (job == 'serverMocha') {
64-
return kibanaPipeline.functionalTestProcess('serverMocha', {
65-
kibanaPipeline.bash(
66-
"""
67-
source src/dev/ci_setup/setup_env.sh
68-
node scripts/mocha
69-
""",
70-
"run `node scripts/mocha`"
71-
)
72-
})
73-
} else if (job == 'accessibility') {
60+
if (job == 'accessibility') {
7461
return kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh')
7562
} else if (job == 'firefoxSmoke') {
7663
return kibanaPipeline.functionalTestProcess('firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh')

.ci/teamcity/checks/sasslint.sh renamed to .ci/teamcity/checks/stylelint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set -euo pipefail
44

55
source "$(dirname "${0}")/../util.sh"
66

7-
checks-reporter-with-killswitch "Lint: sasslint" \
8-
node scripts/sasslint
7+
checks-reporter-with-killswitch "Lint: stylelint" \
8+
node scripts/stylelint

‎.ci/teamcity/tests/mocha.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.eslintrc.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
7171
*/
7272
`;
7373

74-
const allMochaRulesOff = {};
75-
Object.keys(require('eslint-plugin-mocha').rules).forEach((k) => {
76-
allMochaRulesOff['mocha/' + k] = 'off';
77-
});
78-
7974
module.exports = {
8075
root: true,
8176

@@ -542,7 +537,6 @@ module.exports = {
542537
'packages/kbn-eslint-import-resolver-kibana/**/*.js',
543538
'packages/kbn-eslint-plugin-eslint/**/*',
544539
'x-pack/gulpfile.js',
545-
'x-pack/dev-tools/mocha/setup_mocha.js',
546540
'x-pack/scripts/*.js',
547541
],
548542
excludedFiles: ['**/integration_tests/**/*'],
@@ -574,7 +568,9 @@ module.exports = {
574568
*/
575569
{
576570
files: ['test/harden/*.js', 'packages/elastic-safer-lodash-set/test/*.js'],
577-
rules: allMochaRulesOff,
571+
rules: {
572+
'mocha/handle-done-callback': 'off',
573+
},
578574
},
579575
{
580576
files: ['**/*.{js,mjs,ts,tsx}'],
@@ -794,7 +790,6 @@ module.exports = {
794790
files: ['x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
795791
plugins: ['eslint-plugin-node', 'react'],
796792
env: {
797-
mocha: true,
798793
jest: true,
799794
},
800795
rules: {
@@ -930,7 +925,6 @@ module.exports = {
930925
files: ['x-pack/plugins/lists/**/*.{js,mjs,ts,tsx}'],
931926
plugins: ['eslint-plugin-node'],
932927
env: {
933-
mocha: true,
934928
jest: true,
935929
},
936930
rules: {

‎.github/CODEOWNERS‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,6 @@
9898
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
9999
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
100100

101-
# Core UI
102-
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
103-
/src/plugins/home/public @elastic/kibana-core-ui
104-
/src/plugins/home/server/*.ts @elastic/kibana-core-ui
105-
/src/plugins/home/server/services/ @elastic/kibana-core-ui
106-
/src/plugins/kibana_overview/ @elastic/kibana-core-ui
107-
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
108-
#CC# /src/plugins/newsfeed @elastic/kibana-core-ui
109-
#CC# /src/plugins/home/public @elastic/kibana-core-ui
110-
#CC# /src/plugins/home/server/services/ @elastic/kibana-core-ui
111-
#CC# /src/plugins/home/ @elastic/kibana-core-ui
112-
#CC# /x-pack/plugins/global_search_providers/ @elastic/kibana-core-ui
113101

114102
# Observability UIs
115103
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
@@ -138,10 +126,6 @@
138126
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
139127
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
140128
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
141-
/x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
142-
/x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
143-
/x-pack/plugins/stack_alerts/server/alert_types/geo_threshold @elastic/kibana-gis
144-
/x-pack/plugins/stack_alerts/public/alert_types/geo_threshold @elastic/kibana-gis
145129
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
146130
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
147131
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
@@ -200,6 +184,11 @@
200184
/src/plugins/status_page/ @elastic/kibana-core
201185
/src/plugins/saved_objects_management/ @elastic/kibana-core
202186
/src/dev/run_check_published_api_changes.ts @elastic/kibana-core
187+
/src/plugins/home/public @elastic/kibana-core
188+
/src/plugins/home/server/*.ts @elastic/kibana-core
189+
/src/plugins/home/server/services/ @elastic/kibana-core
190+
/src/plugins/kibana_overview/ @elastic/kibana-core
191+
/x-pack/plugins/global_search_bar/ @elastic/kibana-core
203192
#CC# /src/core/server/csp/ @elastic/kibana-core
204193
#CC# /src/legacy/server/config/ @elastic/kibana-core
205194
#CC# /src/legacy/server/http/ @elastic/kibana-core
@@ -210,6 +199,11 @@
210199
#CC# /x-pack/plugins/cloud/ @elastic/kibana-core
211200
#CC# /x-pack/plugins/features/ @elastic/kibana-core
212201
#CC# /x-pack/plugins/global_search/ @elastic/kibana-core
202+
#CC# /src/plugins/newsfeed @elastic/kibana-core
203+
#CC# /src/plugins/home/public @elastic/kibana-core
204+
#CC# /src/plugins/home/server/services/ @elastic/kibana-core
205+
#CC# /src/plugins/home/ @elastic/kibana-core
206+
#CC# /x-pack/plugins/global_search_providers/ @elastic/kibana-core
213207

214208
# Kibana Telemetry
215209
/packages/kbn-analytics/ @elastic/kibana-core
@@ -236,7 +230,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
236230
# Security
237231
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
238232
/src/plugins/security_oss/ @elastic/kibana-security
239-
/src/plugins/spaces_oss/ @elastic/kibana-security
240233
/test/security_functional/ @elastic/kibana-security
241234
/x-pack/plugins/spaces/ @elastic/kibana-security
242235
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
@@ -263,7 +256,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
263256
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
264257
/docs/user/alerting/ @elastic/kibana-alerting-services
265258
/docs/management/alerting/ @elastic/kibana-alerting-services
266-
#CC# /x-pack/plugins/stack_alerts/ @elastic/kibana-alerting-services
259+
#CC# /x-pack/plugins/stack_alerts @elastic/kibana-alerting-services
267260

268261
# Enterprise Search
269262
# Shared

‎.prettierignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# use stylelint
2+
*.scss

‎.sass-lint.yml‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎.stylelintignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss
2+
build
3+
target

‎.stylelintrc‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
plugins:
2+
- stylelint-scss
3+
rules:
4+
color-no-invalid-hex: true
5+
function-calc-no-invalid: true
6+
string-no-newline: true
7+
unit-no-unknown: true
8+
property-no-unknown:
9+
- true
10+
# Used in css modules
11+
- ignoreProperties:
12+
- composes
13+
block-no-empty: true
14+
selector-pseudo-class-no-unknown:
15+
- true
16+
# Used in css modules
17+
- ignorePseudoClasses:
18+
- local
19+
- global
20+
selector-pseudo-element-no-unknown: true
21+
media-feature-name-no-unknown: true
22+
at-rule-no-unknown:
23+
- true
24+
# Sass related mixins
25+
- ignoreAtRules:
26+
- include
27+
- mixin
28+
- if
29+
- else
30+
- each
31+
- extend
32+
- function
33+
- return
34+
- for
35+
comment-no-empty: true
36+
no-duplicate-at-import-rules: true
37+
no-duplicate-selectors: true
38+
no-extra-semicolons: true
39+
alpha-value-notation: number
40+
color-named: never
41+
length-zero-no-unit: true
42+
no-eol-whitespace: true
43+
max-empty-lines: 1
44+
# no-descending-specificity: true
45+
number-leading-zero: never
46+
color-hex-case: upper
47+
string-quotes: single
48+
indentation: 2
49+
declaration-block-no-duplicate-properties:
50+
- true
51+
# We use some rare duplicate property values for browser variance
52+
- ignoreProperties:
53+
- font-size
54+
- word-break
55+
- composes
56+
- filter
57+
- background
58+
- width
59+
- transition
60+
- display
61+
62+
# ($var / 2) rather than ($var/2)
63+
function-calc-no-unspaced-operator: true
64+
65+
# something { not something{
66+
block-opening-brace-space-before: always
67+
68+
# TODO: # Allows input[type=search]
69+
selector-no-qualifying-type:
70+
- true
71+
- ignore:
72+
- attribute
73+
74+
# Put a line-break between sections of CSS, but allow quicky one-liners for legibility
75+
block-closing-brace-newline-after:
76+
- always-multi-line
77+
- ignoreAtRules:
78+
- if
79+
- else
80+
81+
# camelCase mixin, function, and variable names
82+
scss/at-mixin-pattern: "^[a-z][a-zA-Z0-9]+$"
83+
scss/at-function-pattern: "^[a-z][a-zA-Z0-9]+$"
84+
scss/dollar-variable-pattern: "^[a-z][a-zA-Z0-9]+$"

‎.teamcity/src/builds/Lint.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ import kibanaAgent
66

77
object Lint : BuildType({
88
name = "Lint"
9-
description = "Executes Linting, such as eslint and sasslint"
9+
description = "Executes Linting, such as eslint and stylelint"
1010

1111
kibanaAgent(2)
1212

1313
steps {
1414
script {
15-
name = "Sasslint"
15+
name = "Stylelint"
1616

1717
scriptContent =
1818
"""
1919
#!/bin/bash
20-
./.ci/teamcity/checks/sasslint.sh
20+
./.ci/teamcity/checks/stylelint.sh
2121
""".trimIndent()
2222
}
2323

0 commit comments

Comments
 (0)