Merge branch 'master' into fix/siem-eslint

Author: elasticmachine

.ci/Jenkinsfile_flaky

@@ -8,26 +8,28 @@ def JOB_PARTS = params.CI_GROUP.split(':')
 def IS_XPACK = JOB_PARTS[0] == 'xpack'
 def JOB = JOB_PARTS[1]
 def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
+def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
+def AGENT_COUNT = getAgentCount(EXECUTIONS)
 
 def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP)
 
 def workerFailures = []
 
 currentBuild.displayName += trunc(" ${params.GITHUB_OWNER}:${params.branch_specifier}", 24)
-currentBuild.description = "${params.CI_GROUP}<br />Executions: ${params.NUMBER_EXECUTIONS}"
-
-// Note: If you increase agent count, it will execute NUMBER_EXECUTIONS per agent. It will not divide them up amongst the agents
-// e.g. NUMBER_EXECUTIONS = 25, agentCount = 4 results in 100 total executions
-def agentCount = 1
+currentBuild.description = "${params.CI_GROUP}<br />Agents: ${AGENT_COUNT}<br />Executions: ${params.NUMBER_EXECUTIONS}"
 
 stage("Kibana Pipeline") {
   timeout(time: 180, unit: 'MINUTES') {
     timestamps {
       ansiColor('xterm') {
         def agents = [:]
-        for(def agentNumber = 1; agentNumber <= agentCount; agentNumber++) {
+        for(def agentNumber = 1; agentNumber <= AGENT_COUNT; agentNumber++) {
+          def agentNumberInside = agentNumber
+          def agentExecutions = floor(EXECUTIONS/AGENT_COUNT) + (agentNumber <= EXECUTIONS%AGENT_COUNT ? 1 : 0)
           agents["agent-${agentNumber}"] = {
             catchError {
+              print "Agent ${agentNumberInside} - ${agentExecutions} executions"
+
               kibanaPipeline.withWorkers('flaky-test-runner', {
                 if (!IS_XPACK) {
                   kibanaPipeline.buildOss()
@@ -37,7 +39,7 @@ stage("Kibana Pipeline") {
                 } else {
                   kibanaPipeline.buildXpack()
                 }
-              }, getWorkerMap(agentNumber, params.NUMBER_EXECUTIONS.toInteger(), worker, workerFailures))()
+              }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
             }
           }
         }
@@ -77,17 +79,20 @@ def getWorkerFromParams(isXpack, job, ciGroup) {
   }
 }
 
-def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkers = 14) {
+def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkerProcesses = 12) {
   def workerMap = [:]
-  def numberOfWorkers = Math.min(numberOfExecutions, maxWorkers)
+  def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses)
 
   for(def i = 1; i <= numberOfWorkers; i++) {
     def workerExecutions = numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0)
 
     workerMap["agent-${agentNumber}-worker-${i}"] = { workerNumber ->
       for(def j = 0; j < workerExecutions; j++) {
         print "Execute agent-${agentNumber} worker-${workerNumber}: ${j}"
-        withEnv(["JOB=agent-${agentNumber}-worker-${workerNumber}-${j}"]) {
+        withEnv([
+          "JOB=agent-${agentNumber}-worker-${workerNumber}-${j}",
+          "REMOVE_KIBANA_INSTALL_DIR=1",
+        ]) {
           catchError {
             try {
               worker(workerNumber)
@@ -104,10 +109,23 @@ def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWor
   return workerMap
 }
 
+def getAgentCount(executions) {
+  // Increase agent count every 24 worker processess, up to 3 agents maximum
+  return Math.min(3, 1 + floor(executions/24))
+}
+
 def trunc(str, length) {
   if (str.size() >= length) {
     return str.take(length) + "..."
   }
 
   return str;
 }
+
+// All of the real rounding/truncating methods are sandboxed
+def floor(num) {
+  return num
+    .toString()
+    .split('\\.')[0]
+    .toInteger()
+}

.ci/jobs.yml

@@ -14,7 +14,8 @@ JOB:
   - kibana-ciGroup10
   - kibana-ciGroup11
   - kibana-ciGroup12
-  # - kibana-visualRegression
+  - kibana-accessibility
+  - kibana-visualRegression
 
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
   - x-pack-firefoxSmoke
@@ -28,7 +29,8 @@ JOB:
   - x-pack-ciGroup8
   - x-pack-ciGroup9
   - x-pack-ciGroup10
-  # - x-pack-visualRegression
+  - x-pack-accessibility
+  - x-pack-visualRegression
 
 # `~` is yaml for `null`
 exclude: ~

.ci/run.sh

@@ -21,6 +21,9 @@ kibana-ciGroup*)
 kibana-visualRegression*)
   ./test/scripts/jenkins_visual_regression.sh
   ;;
+kibana-accessibility*)
+  ./test/scripts/jenkins_accessibility.sh
+  ;;
 kibana-firefoxSmoke*)
   ./test/scripts/jenkins_firefox_smoke.sh
   ;;
@@ -34,6 +37,9 @@ x-pack-ciGroup*)
 x-pack-visualRegression*)
   ./test/scripts/jenkins_xpack_visual_regression.sh
   ;;
+x-pack-accessibility*)
+  ./test/scripts/jenkins_xpack_accessibility.sh
+  ;;
 x-pack-firefoxSmoke*)
   ./test/scripts/jenkins_xpack_firefox_smoke.sh
   ;;

.eslintrc.js

@@ -355,10 +355,10 @@ module.exports = {
                   '!src/core/server/*.test.mocks.ts',
 
                   'src/plugins/**/public/**/*',
-                  '!src/plugins/**/public/index*',
+                  '!src/plugins/**/public/index.{js,ts,tsx}',
 
                   'src/plugins/**/server/**/*',
-                  '!src/plugins/**/server/index*',
+                  '!src/plugins/**/server/index.{js,ts,tsx}',
                 ],
                 allowSameFolder: true,
               },
@@ -393,6 +393,7 @@ module.exports = {
         'x-pack/test/functional/apps/**/*.js',
         'x-pack/legacy/plugins/apm/**/*.js',
         'test/*/config.ts',
+        'test/*/{tests,test_suites,apis,apps}/**/*',
         'test/visual_regression/tests/**/*',
         'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
         'x-pack/test/*/*config.*ts',

.github/CODEOWNERS

@@ -44,7 +44,7 @@
 /x-pack/test/functional/services/ml.ts  @elastic/ml-ui
 # ML team owns the transform plugin, ES team added here for visibility
 # because the plugin lives in Kibana's Elasticsearch management section.
-/x-pack/legacy/plugins/transform/  @elastic/ml-ui @elastic/es-ui 
+/x-pack/legacy/plugins/transform/  @elastic/ml-ui @elastic/es-ui
 
 # Operations
 /renovate.json5 @elastic/kibana-operations
@@ -68,7 +68,9 @@
 # Security
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
+/x-pack/plugins/spaces/  @elastic/kibana-security
 /x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
+/x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /src/legacy/server/csp/ @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security

.i18nrc.json

@@ -1,39 +1,39 @@
 {
   "paths": {
     "common.ui": "src/legacy/ui",
-    "data": ["src/legacy/core_plugins/data", "src/plugins/data"],
-    "expressions": "src/legacy/core_plugins/expressions",
-    "expressions_np": "src/plugins/expressions",
-    "kibana_react": "src/legacy/core_plugins/kibana_react",
-    "navigation": "src/legacy/core_plugins/navigation",
-    "server": "src/legacy/server",
     "console": "src/legacy/core_plugins/console",
     "core": "src/core",
+    "dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
+    "data": ["src/legacy/core_plugins/data", "src/plugins/data"],
+    "embeddableApi": "src/plugins/embeddable",
+    "esUi": "src/plugins/es_ui_shared",
+    "expressions_np": "src/plugins/expressions",
+    "expressions": "src/legacy/core_plugins/expressions",
     "inputControl": "src/legacy/core_plugins/input_control_vis",
+    "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
     "interpreter": "src/legacy/core_plugins/interpreter",
-    "dashboardEmbeddableContainer": "src/legacy/core_plugins/dashboard_embeddable_container",
     "kbn": "src/legacy/core_plugins/kibana",
     "kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
-    "embeddableApi": "src/plugins/embeddable",
+    "kbnESQuery": "packages/kbn-es-query",
     "kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
-    "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
-    "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
-    "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
-    "visTypeTable": "src/legacy/core_plugins/vis_type_table",
+    "kibana_react": "src/legacy/core_plugins/kibana_react",
+    "kibana-react": "src/plugins/kibana_react",
+    "navigation": "src/legacy/core_plugins/navigation",
     "regionMap": "src/legacy/core_plugins/region_map",
+    "server": "src/legacy/server",
     "statusPage": "src/legacy/core_plugins/status_page",
+    "telemetry": "src/legacy/core_plugins/telemetry",
     "tileMap": "src/legacy/core_plugins/tile_map",
     "timelion": "src/legacy/core_plugins/timelion",
+    "uiActions": "src/plugins/ui_actions",
+    "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
+    "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
+    "visTypeTable": "src/legacy/core_plugins/vis_type_table",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
-    "kbnESQuery": "packages/kbn-es-query",
-    "inspector": "src/plugins/inspector",
-    "kibana-react": "src/plugins/kibana_react",
-    "visualizations": "src/plugins/visualizations",
-    "telemetry": "src/legacy/core_plugins/telemetry",
-    "esUi": "src/plugins/es_ui_shared",
-    "uiActions": "src/plugins/ui_actions"
+    "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
+    "visualizations": "src/plugins/visualizations"
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": []

Jenkinsfile

@@ -25,7 +25,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
               'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
               'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
               'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
-              // 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
+              'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }),
+              'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
             ]),
             'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
               'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
@@ -39,7 +40,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
               'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
               'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
               'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' }),
-              // 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }),
+              'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld './test/scripts/jenkins_xpack_accessibility.sh' }),
+              'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }),
             ]),
           ])
         }