Merge branch 'master' into white-to-allow

.backportrc.json

@@ -3,6 +3,7 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.9",
     "7.8",
     "7.7",
     "7.6",
@@ -26,7 +27,7 @@
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.9.0$": "7.x",
+    "^v7.10.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   }
 }

.browserslistrc

@@ -1,7 +1,9 @@
 [production]
-last 2 versions
-> 5%
-Safari 7 # for PhantomJS support: https://github.com/elastic/kibana/issues/27136
+last 2 Firefox versions
+last 2 Chrome versions
+last 2 Safari versions
+> 0.25%
+not ie 11
 
 [dev]
 last 1 chrome versions

.ci/Jenkinsfile_baseline_capture

@@ -0,0 +1,28 @@
+#!/bin/groovy
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load()
+
+kibanaPipeline(timeoutMinutes: 120) {
+  githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
+    ciStats.trackBuild {
+      catchError {
+        parallel([
+          'oss-visualRegression': {
+            workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
+              kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
+            }
+          },
+          'xpack-visualRegression': {
+            workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
+              kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
+            }
+          },
+        ])
+      }
+
+      kibanaPipeline.sendMail()
+      slackNotifications.onFailure()
+    }
+  }
+}

.ci/Jenkinsfile_baseline_trigger

@@ -0,0 +1,64 @@
+#!/bin/groovy
+
+def MAXIMUM_COMMITS_TO_CHECK = 10
+def MAXIMUM_COMMITS_TO_BUILD = 5
+
+if (!params.branches_yaml) {
+  error "'branches_yaml' parameter must be specified"
+}
+
+def additionalBranches = []
+
+def branches = readYaml(text: params.branches_yaml) + additionalBranches
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load()
+
+withGithubCredentials {
+  branches.each { branch ->
+    stage(branch) {
+      def commits = getCommits(branch, MAXIMUM_COMMITS_TO_CHECK, MAXIMUM_COMMITS_TO_BUILD)
+
+      commits.take(MAXIMUM_COMMITS_TO_BUILD).each { commit ->
+        catchErrors {
+          githubCommitStatus.create(commit, 'pending', 'Baseline started.', 'kibana-ci-baseline')
+
+          build(
+            propagate: false,
+            wait: false,
+            job: 'elastic+kibana+baseline-capture',
+            parameters: [
+              string(name: 'branch_specifier', value: branch),
+              string(name: 'commit', value: commit),
+            ]
+          )
+        }
+      }
+    }
+  }
+}
+
+def getCommits(String branch, maximumCommitsToCheck, maximumCommitsToBuild) {
+  print "Getting latest commits for ${branch}..."
+  def commits = githubApi.get("repos/elastic/kibana/commits?sha=${branch}").take(maximumCommitsToCheck).collect { it.sha }
+  def commitsToBuild = []
+
+  for (commit in commits) {
+    print "Getting statuses for ${commit}"
+    def status = githubApi.get("repos/elastic/kibana/statuses/${commit}").find { it.context == 'kibana-ci-baseline' }
+    print "Commit '${commit}' already built? ${status ? 'Yes' : 'No'}"
+
+    if (!status) {
+      commitsToBuild << commit
+    } else {
+      // Stop at the first commit we find that's already been triggered
+      break
+    }
+
+    if (commitsToBuild.size() >= maximumCommitsToBuild) {
+      break
+    }
+  }
+
+  return commitsToBuild.reverse() // We want the builds to trigger oldest-to-newest
+}

.ci/Jenkinsfile_coverage

@@ -13,6 +13,7 @@ kibanaPipeline(timeoutMinutes: 240) {
       workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
         catchError {
           kibanaCoverage.runTests()
+          kibanaTeamAssign.load('team_assignment', "### Upload Team Assignment JSON")
           handleIngestion(TIME_STAMP)
         }
         handleFail()

.ci/end2end.groovy

@@ -110,6 +110,9 @@ pipeline {
         archiveArtifacts(allowEmptyArchive: true, artifacts: "${E2E_DIR}/kibana.log")
       }
     }
+    cleanup {
+      notifyBuildResult(prComment: false, analyzeFlakey: false, shouldNotify: false)
+    }
   }
 }
 

.ci/packer_cache_for_branch.sh

@@ -18,7 +18,7 @@ node scripts/es snapshot --download-only;
 node scripts/es snapshot --license=oss --download-only;
 
 # download reporting browsers
-(cd "x-pack" && yarn gulp prepare);
+(cd "x-pack" && yarn gulp downloadChromium);
 
 # cache the chromedriver archive
 chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"

.ci/pipeline-library/src/test/githubCommitStatus.groovy

@@ -12,6 +12,7 @@ class GithubCommitStatusTest extends KibanaBasePipelineTest {
 
   interface BuildState {
     Object get(String key)
+    Object has(String key)
   }
 
   interface GithubApi {
@@ -25,6 +26,7 @@ class GithubCommitStatusTest extends KibanaBasePipelineTest {
     buildStateMock = mock(BuildState)
     githubApiMock = mock(GithubApi)
 
+    when(buildStateMock.has('checkoutInfo')).thenReturn(true)
     when(buildStateMock.get('checkoutInfo')).thenReturn([ commit: 'COMMIT_HASH', ])
     when(githubApiMock.post(any(), any())).thenReturn(null)
 

.ci/pipeline-library/src/test/prChanges.groovy

@@ -84,4 +84,17 @@ class PrChangesTest extends KibanaBasePipelineTest {
 
     assertFalse(prChanges.areChangesSkippable())
   }
+
+  @Test
+  void 'areChangesSkippable() with skippable changes that are in notSkippablePaths'() {
+    props([
+      githubPrs: [
+        getChanges: { [
+          [filename: 'docs/developer/architecture/code-exploration.asciidoc'],
+        ] },
+      ],
+    ])
+
+    assertFalse(prChanges.areChangesSkippable())
+  }
 }

.eslintignore

@@ -26,13 +26,14 @@ target
 /src/plugins/data/common/es_query/kuery/ast/_generated_/**
 /src/plugins/vis_type_timelion/public/_generated_/**
 /src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
+/src/plugins/timelion/public/webpackShims/jquery.flot.*
 /x-pack/legacy/plugins/**/__tests__/fixtures/**
 /x-pack/plugins/apm/e2e/**/snapshots.js
 /x-pack/plugins/apm/e2e/tmp/*
 /x-pack/plugins/canvas/canvas_plugin
 /x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/plugins/canvas/shareable_runtime/build
-/x-pack/plugins/canvas/storybook
+/x-pack/plugins/canvas/storybook/build
 /x-pack/plugins/monitoring/public/lib/jquery_flot
 /x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
 /x-pack/legacy/plugins/infra/common/graphql/types.ts