Skip to content

Commit ae41ba1

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into fix/spriteloading
2 parents 971ba49 + 4c33f2a commit ae41ba1

File tree

782 files changed

+11999
-5109
lines changed

Some content is hidden

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

782 files changed

+11999
-5109
lines changed

‎.ci/Jenkinsfile_flaky‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ stage("Kibana Pipeline") {
3434
if (!IS_XPACK) {
3535
kibanaPipeline.buildOss()
3636
if (CI_GROUP == '1') {
37-
runbld "./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh"
37+
runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
3838
}
3939
} else {
4040
kibanaPipeline.buildXpack()
@@ -62,18 +62,18 @@ stage("Kibana Pipeline") {
6262
def getWorkerFromParams(isXpack, job, ciGroup) {
6363
if (!isXpack) {
6464
if (job == 'firefoxSmoke') {
65-
return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' })
65+
return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') })
6666
} else if(job == 'visualRegression') {
67-
return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' })
67+
return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') })
6868
} else {
6969
return kibanaPipeline.getOssCiGroupWorker(ciGroup)
7070
}
7171
}
7272

7373
if (job == 'firefoxSmoke') {
74-
return kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' })
74+
return kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') })
7575
} else if(job == 'visualRegression') {
76-
return kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' })
76+
return kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') })
7777
} else {
7878
return kibanaPipeline.getXpackCiGroupWorker(ciGroup)
7979
}

‎.eslintrc.js‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,6 @@ module.exports = {
214214
'jsx-a11y/click-events-have-key-events': 'off',
215215
},
216216
},
217-
{
218-
files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'],
219-
rules: {
220-
'react-hooks/exhaustive-deps': 'off',
221-
'react-hooks/rules-of-hooks': 'off',
222-
},
223-
},
224217
{
225218
files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'],
226219
rules: {
@@ -839,6 +832,8 @@ module.exports = {
839832
// might be introduced after the other warns are fixed
840833
// 'react/jsx-sort-props': 'error',
841834
'react/jsx-tag-spacing': 'error',
835+
// might be introduced after the other warns are fixed
836+
'react-hooks/exhaustive-deps': 'off',
842837
'require-atomic-updates': 'error',
843838
'rest-spread-spacing': ['error', 'never'],
844839
'symbol-description': 'error',

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
# Canvas
2929
/x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
3030

31-
# Code
32-
/x-pack/legacy/plugins/code/ @teams/code
33-
/x-pack/test/functional/apps/code/ @teams/code
34-
/x-pack/test/api_integration/apis/code/ @teams/code
35-
3631
# Logs & Metrics UI
3732
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
3833
/x-pack/legacy/plugins/integrations_manager/ @elastic/epm

‎Jenkinsfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
2424
'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
2525
'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
2626
'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
27-
'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
28-
'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }),
29-
'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
27+
'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
28+
'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility') }),
29+
'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
3030
]),
3131
'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
3232
'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
@@ -39,9 +39,9 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
3939
'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
4040
'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
4141
'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
42-
'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' }),
43-
'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld './test/scripts/jenkins_xpack_accessibility.sh' }),
44-
'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }),
42+
'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
43+
'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility') }),
44+
'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
4545
]),
4646
])
4747
}

‎STYLEGUIDE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ You should prefer modern language features in a lot of cases, e.g.:
120120
* Prefer arrow function over storing `this` (no `const self = this;`)
121121
* Prefer template strings over string concatenation
122122
* Prefer the spread operator for copying arrays (`[...arr]`) over `arr.slice()`
123+
* Use optional chaining (`?.`) and nullish Coalescing (`??`) over `lodash.get` (and similar utilities)
123124
124125
### Avoid mutability and state
125126

0 commit comments

Comments
 (0)