Merge branch 'master' into cleanup

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

.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/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)")"

.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/*

.eslintrc.js

@@ -49,6 +49,31 @@ const ELASTIC_LICENSE_HEADER = `
  */
 `;
 
+const SAFER_LODASH_SET_HEADER = `
+/*
+ * Elasticsearch B.V licenses this file to you under the MIT License.
+ * See \`packages/elastic-safer-lodash-set/LICENSE\` for more information.
+ */
+`;
+
+const SAFER_LODASH_SET_LODASH_HEADER = `
+/*
+ * This file is forked from the lodash project (https://lodash.com/),
+ * and may include modifications made by Elasticsearch B.V.
+ * Elasticsearch B.V. licenses this file to you under the MIT License.
+ * See \`packages/elastic-safer-lodash-set/LICENSE\` for more information.
+ */
+`;
+
+const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
+/*
+ * This file is forked from the DefinitelyTyped project (https://github.com/DefinitelyTyped/DefinitelyTyped),
+ * and may include modifications made by Elasticsearch B.V.
+ * Elasticsearch B.V. licenses this file to you under the MIT License.
+ * See \`packages/elastic-safer-lodash-set/LICENSE\` for more information.
+ */
+`;
+
 const allMochaRulesOff = {};
 Object.keys(require('eslint-plugin-mocha').rules).forEach((k) => {
  allMochaRulesOff['mocha/' + k] = 'off';
@@ -143,7 +168,12 @@ module.exports = {
  '@kbn/eslint/disallow-license-headers': [
  'error',
  {
- licenses: [ELASTIC_LICENSE_HEADER],
+ licenses: [
+ ELASTIC_LICENSE_HEADER,
+ SAFER_LODASH_SET_HEADER,
+ SAFER_LODASH_SET_LODASH_HEADER,
+ SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
+ ],
  },
  ],
  },
@@ -174,7 +204,82 @@ module.exports = {
  '@kbn/eslint/disallow-license-headers': [
  'error',
  {
- licenses: [APACHE_2_0_LICENSE_HEADER],
+ licenses: [
+ APACHE_2_0_LICENSE_HEADER,
+ SAFER_LODASH_SET_HEADER,
+ SAFER_LODASH_SET_LODASH_HEADER,
+ SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
+ ],
+ },
+ ],
+ },
+ },
+
+ /**
+ * safer-lodash-set package requires special license headers
+ */
+ {
+ files: ['packages/elastic-safer-lodash-set/**/*.{js,mjs,ts,tsx}'],
+ rules: {
+ '@kbn/eslint/require-license-header': [
+ 'error',
+ {
+ license: SAFER_LODASH_SET_LODASH_HEADER,
+ },
+ ],
+ '@kbn/eslint/disallow-license-headers': [
+ 'error',
+ {
+ licenses: [
+ ELASTIC_LICENSE_HEADER,
+ APACHE_2_0_LICENSE_HEADER,
+ SAFER_LODASH_SET_HEADER,
+ SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
+ ],
+ },
+ ],
+ },
+ },
+ {
+ files: ['packages/elastic-safer-lodash-set/test/*.{js,mjs,ts,tsx}'],
+ rules: {
+ '@kbn/eslint/require-license-header': [
+ 'error',
+ {
+ license: SAFER_LODASH_SET_HEADER,
+ },
+ ],
+ '@kbn/eslint/disallow-license-headers': [
+ 'error',
+ {
+ licenses: [
+ ELASTIC_LICENSE_HEADER,
+ APACHE_2_0_LICENSE_HEADER,
+ SAFER_LODASH_SET_LODASH_HEADER,
+ SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
+ ],
+ },
+ ],
+ },
+ },
+ {
+ files: ['packages/elastic-safer-lodash-set/**/*.d.ts'],
+ rules: {
+ '@kbn/eslint/require-license-header': [
+ 'error',
+ {
+ license: SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
+ },
+ ],
+ '@kbn/eslint/disallow-license-headers': [
+ 'error',
+ {
+ licenses: [
+ ELASTIC_LICENSE_HEADER,
+ APACHE_2_0_LICENSE_HEADER,
+ SAFER_LODASH_SET_HEADER,
+ SAFER_LODASH_SET_LODASH_HEADER,
+ ],
  },
  ],
  },
@@ -541,9 +646,129 @@ module.exports = {
  * Harden specific rules
  */
  {
- files: ['test/harden/*.js'],
+ files: ['test/harden/*.js', 'packages/elastic-safer-lodash-set/test/*.js'],
  rules: allMochaRulesOff,
  },
+ {
+ files: ['**/*.{js,mjs,ts,tsx}'],
+ rules: {
+ 'no-restricted-imports': [
+ 2,
+ {
+ paths: [
+ {
+ name: 'lodash',
+ importNames: ['set', 'setWith'],
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash.set',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash.setwith',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/set',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/setWith',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/fp',
+ importNames: ['set', 'setWith', 'assoc', 'assocPath'],
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/fp/set',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/fp/setWith',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/fp/assoc',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/fp/assocPath',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ ],
+ },
+ ],
+ 'no-restricted-modules': [
+ 2,
+ {
+ paths: [
+ {
+ name: 'lodash.set',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash.setwith',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/set',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ name: 'lodash/setWith',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ ],
+ },
+ ],
+ 'no-restricted-properties': [
+ 2,
+ {
+ object: 'lodash',
+ property: 'set',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ object: '_',
+ property: 'set',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ object: 'lodash',
+ property: 'setWith',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ object: '_',
+ property: 'setWith',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ object: 'lodash',
+ property: 'assoc',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ object: '_',
+ property: 'assoc',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ object: 'lodash',
+ property: 'assocPath',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ {
+ object: '_',
+ property: 'assocPath',
+ message: 'Please use @elastic/safer-lodash-set instead',
+ },
+ ],
+ },
+ },
 
  /**
  * APM overrides

.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'

Jenkinsfile

@@ -42,7 +42,6 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
  'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
  'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
  'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
- // 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
  'xpack-securitySolutionCypress': { processNumber ->
  whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
  kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)

docs/api/dashboard/export-dashboard.asciidoc

@@ -35,7 +35,7 @@ experimental[] Export dashboards and corresponding saved objects.
 
 [source,sh]
 --------------------------------------------------
-$ curl -X GET "localhost:5601/api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c" <1>
+$ curl -X GET api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c <1>
 --------------------------------------------------
 // KIBANA