Merge branch 'master' into issue_112699

elastic · Sep 22, 2021 · 484a65a · 484a65a
2 parents b089553 + cdc34cf
commit 484a65a
Show file tree

Hide file tree

Showing 974 changed files with 21,794 additions and 6,542 deletions.
diff --git a/.buildkite/pipelines/es_snapshots/verify.yml b/.buildkite/pipelines/es_snapshots/verify.yml
@@ -29,6 +29,7 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
+    timeout_in_minutes: 150
     key: default-cigroup
     retry:
       automatic:
@@ -40,6 +41,7 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
+    timeout_in_minutes: 120
     key: default-cigroup-docker
     retry:
       automatic:
@@ -52,6 +54,7 @@ steps:
     agents:
       queue: ci-group-4d
     depends_on: build
+    timeout_in_minutes: 120
     key: oss-cigroup
     retry:
       automatic:
@@ -61,7 +64,8 @@ steps:
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
     agents:
-      queue: jest
+      queue: n2-4
+    timeout_in_minutes: 120
     key: jest-integration
     retry:
       automatic:
@@ -72,6 +76,7 @@ steps:
     label: 'API Integration Tests'
     agents:
       queue: jest
+    timeout_in_minutes: 120
     key: api-integration
 
   - command: .buildkite/scripts/steps/es_snapshots/trigger_promote.sh

diff --git a/.buildkite/pipelines/hourly.yml b/.buildkite/pipelines/hourly.yml
@@ -1,3 +1,5 @@
+env:
+  REPORT_FAILED_TESTS_TO_GITHUB: 'true'
 steps:
   - command: .buildkite/scripts/lifecycle/pre_build.sh
     label: Pre-Build
@@ -17,7 +19,7 @@ steps:
     agents:
       queue: ci-group-6
     depends_on: build
-    timeout_in_minutes: 120
+    timeout_in_minutes: 150
     key: default-cigroup
     retry:
       automatic:
@@ -118,14 +120,14 @@ steps:
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
     agents:
-      queue: jest
+      queue: n2-4
     timeout_in_minutes: 120
     key: jest-integration
 
   - command: .buildkite/scripts/steps/test/api_integration.sh
     label: 'API Integration Tests'
     agents:
-      queue: jest
+      queue: n2-2
     timeout_in_minutes: 120
     key: api-integration
 

diff --git a/.buildkite/scripts/lifecycle/post_command.sh b/.buildkite/scripts/lifecycle/post_command.sh
@@ -22,6 +22,5 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
   buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
   buildkite-agent artifact upload '.es/**/*.hprof'
 
-  # TODO - re-enable when Jenkins is disabled
-  # node scripts/report_failed_tests --build-url="${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}" 'target/junit/**/*.xml'
+  node scripts/report_failed_tests --build-url="${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}" 'target/junit/**/*.xml'
 fi
diff --git a/.buildkite/scripts/steps/storybooks/build_and_upload.js b/.buildkite/scripts/steps/storybooks/build_and_upload.js
@@ -13,6 +13,7 @@ const STORYBOOKS = [
   'dashboard_enhanced',
   'data_enhanced',
   'embeddable',
+  'fleet',
   'infra',
   'security_solution',
   'ui_actions_enhanced',

diff --git a/.buildkite/scripts/steps/test/jest_integration.sh b/.buildkite/scripts/steps/test/jest_integration.sh
@@ -10,4 +10,4 @@ is_test_execution_step
 
 echo '--- Jest Integration Tests'
 checks-reporter-with-killswitch "Jest Integration Tests" \
-  node scripts/jest_integration --ci --verbose
+  node --max-old-space-size=5120 scripts/jest_integration --ci
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1502,7 +1502,7 @@ module.exports = {
      * TSVB overrides
      */
     {
-      files: ['src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}'],
+      files: ['src/plugins/vis_types/timeseries/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'import/no-default-export': 'error',
       },

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -30,7 +30,7 @@
 /src/plugins/vis_types/table/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/tagcloud/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/timelion/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_timeseries/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/timeseries/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/vega/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/vislib/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/xy/ @elastic/kibana-vis-editors
@@ -381,9 +381,9 @@
 #CC# /x-pack/plugins/security_solution/ @elastic/security-solution
 
 # Security Solution sub teams
-/x-pack/plugins/cases @elastic/security-threat-hunting
+/x-pack/plugins/cases @elastic/security-threat-hunting-cases
 /x-pack/plugins/timelines @elastic/security-threat-hunting
-/x-pack/test/case_api_integration @elastic/security-threat-hunting
+/x-pack/test/case_api_integration @elastic/security-threat-hunting-cases
 /x-pack/plugins/lists @elastic/security-detections-response
 
 ## Security Solution sub teams - security-onboarding-and-lifecycle-mgt

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -63,7 +63,7 @@
     "visTypeMetric": "src/plugins/vis_types/metric",
     "visTypeTable": "src/plugins/vis_types/table",
     "visTypeTagCloud": "src/plugins/vis_types/tagcloud",
-    "visTypeTimeseries": "src/plugins/vis_type_timeseries",
+    "visTypeTimeseries": "src/plugins/vis_types/timeseries",
     "visTypeVega": "src/plugins/vis_types/vega",
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,10 @@
 #!/bin/groovy
 
+if (!env.ghprbPullId) {
+  print "Non-PR builds are now in Buildkite."
+  return
+}
+
 library 'kibana-pipeline-library'
 kibanaLibrary.load()