Merge remote-tracking branch 'upstream/master' into fix/form-lib-memoize

.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
+}

.eslintignore

@@ -26,6 +26,7 @@ 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/*

.gitignore

@@ -31,6 +31,7 @@ disabledPlugins
 webpackstats.json
 /config/*
 !/config/kibana.yml
+!/config/node.options
 coverage
 selenium
 .babel_register_cache.json

.i18nrc.json

@@ -44,7 +44,7 @@
  "src/plugins/telemetry_management_section"
  ],
  "tileMap": "src/plugins/tile_map",
- "timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
+ "timelion": ["src/plugins/timelion", "src/plugins/vis_type_timelion"],
  "uiActions": "src/plugins/ui_actions",
  "visDefaultEditor": "src/plugins/vis_default_editor",
  "visTypeMarkdown": "src/plugins/vis_type_markdown",

.sass-lint.yml

@@ -1,7 +1,7 @@
 files:
  include:
  - 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
- - 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
+ - 'src/plugins/timelion/**/*.s+(a|c)ss'
  - 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
  - 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
  - 'x-pack/plugins/canvas/**/*.s+(a|c)ss'