Merge branch 'master' of github.com:elastic/kibana into add-case-logging

elastic · Feb 25, 2021 · 108c861 · 108c861
2 parents 451bcdb + f0838e6
commit 108c861
Show file tree

Hide file tree

Showing 834 changed files with 22,198 additions and 7,716 deletions.
diff --git a/.ci/Dockerfile b/.ci/Dockerfile
@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.15.4
+ARG NODE_VERSION=14.16.0
 
 FROM node:${NODE_VERSION} AS base
 

diff --git a/.ci/Jenkinsfile_security_cypress b/.ci/Jenkinsfile_security_cypress
@@ -17,7 +17,9 @@ kibanaPipeline(timeoutMinutes: 180) {
 
         workers.ci(name: job, size: 'l', ramDisk: true) {
           kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
-          kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress.sh')()
+          kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
+          // Temporarily disabled to figure out test flake
+          // kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
         }
       }
     }

diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -30,38 +30,22 @@ kibanaPipeline(timeoutMinutes: 210) {
         "ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}",
         'IGNORE_SHIP_CI_STATS_ERROR=true',
       ]) {
-        parallel([
-          'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
-          'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
-            'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
-            'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
-            'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
-            'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
-            'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
-            'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
-            'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
-            'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
-            'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
-            'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
-            'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
-            'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
-          ]),
-          'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
-            'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
-            'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
-            'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
-            'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
-            'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
-            'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
-            'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
-            'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
-            'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
-            'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
-            'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
-            'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
-            'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
-          ]),
-        ])
+        kibanaPipeline.withTasks {
+          tasks([
+            kibanaPipeline.scriptTaskDocker('Jest Integration Tests', 'test/scripts/test/jest_integration.sh'),
+            kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh'),
+          ])
+
+          task {
+            kibanaPipeline.buildOss(6)
+            tasks.ossCiGroups()
+          }
+
+          task {
+            kibanaPipeline.buildXpack(10)
+            tasks.xpackCiGroups()
+          }
+        }
       }
 
       promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
@@ -72,7 +56,9 @@ kibanaPipeline(timeoutMinutes: 210) {
 }
 
 def promoteSnapshot(snapshotVersion, snapshotId) {
-  node(workers.label('s')) {
-    esSnapshots.promote(snapshotVersion, snapshotId)
+  if (buildUtils.getBuildStatus() == 'SUCCESS') {
+    node(workers.label('s')) {
+      esSnapshots.promote(snapshotVersion, snapshotId)
+    }
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .aws-config.json
 .signing-config.json
+/api_docs
 .ackrc
 /.es
 /.chromium

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-14.15.4
+14.16.0
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.15.4
+14.16.0
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+303 See Other
+
+Location: https://www.elastic.co/community/codeofconduct