Merge branch 'master' into kertal-pr-2020-01-25-discover-data-grid-te…

…st-2

.ci/teamcity/default/build.sh

@@ -14,6 +14,7 @@ node scripts/build_kibana_platform_plugins \
  --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
  --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
  --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
+ --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
  --verbose
 tc_end_block "Build Platform Plugins"
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,7 @@ Delete any items that are not applicable to this PR.
 - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
 - [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
 - [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
-- [ ] If a plugin configuration key changed, check if it needs to be whitelisted in the [cloud](https:/elastic/cloud) and added to the [docker list](https:/elastic/kibana/blob/c29adfef29e921cc447d2a5ed06ac2047ceab552/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker)
+- [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the [cloud](https:/elastic/cloud) and added to the [docker list](https:/elastic/kibana/blob/c29adfef29e921cc447d2a5ed06ac2047ceab552/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker)
 - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
 - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
 

.teamcity/src/Common.kt

@@ -22,6 +22,14 @@ fun isReportingEnabled(): Boolean {
  return ENABLE_REPORTING;
 }
 
+// master and 7.x get committed to so often, we only want to run full CI for them hourly
+// but for other branches, we can run daily and on merge
+fun isHourlyOnlyBranch(): Boolean {
+ val branch = getProjectBranch()
+
+ return branch == "master" || branch.matches("""^[0-9]+\.x$""".toRegex())
+}
+
 fun makeSafeId(id: String): String {
  return id.replace(Regex("[^a-zA-Z0-9_]"), "_")
 }

.teamcity/src/builds/DailyCi.kt

@@ -0,0 +1,37 @@
+package builds
+
+import addSlackNotifications
+import areTriggersEnabled
+import dependsOn
+import getProjectBranch
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
+
+object DailyCi : BuildType({
+ id("Daily_CI")
+ name = "Daily CI"
+ description = "Runs everything in CI, daily"
+ type = Type.COMPOSITE
+ paused = !areTriggersEnabled()
+
+ triggers {
+ schedule {
+ schedulingPolicy = cron {
+ hours = "0"
+ minutes = "0"
+ }
+ branchFilter = "refs/heads/${getProjectBranch()}"
+ triggerBuild = always()
+ withPendingChangesOnly = false
+ }
+ }
+
+ dependsOn(
+ FullCi
+ ) {
+ onDependencyCancel = FailureAction.ADD_PROBLEM
+ }
+
+ addSlackNotifications()
+})

.teamcity/src/builds/OnMergeCi.kt

@@ -0,0 +1,34 @@
+package builds
+
+import addSlackNotifications
+import areTriggersEnabled
+import dependsOn
+import getProjectBranch
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object OnMergeCi : BuildType({
+ id("OnMerge_CI")
+ name = "On Merge CI"
+ description = "Runs everything in CI, on each commit"
+ type = Type.COMPOSITE
+ paused = !areTriggersEnabled()
+
+ maxRunningBuilds = 1
+
+ triggers {
+ vcs {
+ perCheckinTriggering = false
+ branchFilter = "refs/heads/${getProjectBranch()}"
+ }
+ }
+
+ dependsOn(
+ FullCi
+ ) {
+ onDependencyCancel = FailureAction.ADD_PROBLEM
+ }
+
+ addSlackNotifications()
+})

.teamcity/src/builds/default/DefaultFunctionalBase.kt

@@ -1,13 +1,17 @@
 package builds.default
 
+import StandardAgents
 import addTestSettings
+import co.elastic.teamcity.common.requireAgent
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 
 open class DefaultFunctionalBase(init: BuildType.() -> Unit = {}) : BuildType({
  params {
  param("env.KBN_NP_PLUGINS_BUILT", "true")
  }
 
+ requireAgent(StandardAgents["4"]!!)
+
  dependencies {
  defaultBuildWithPlugins()
  }

.teamcity/src/projects/Kibana.kt

@@ -7,6 +7,7 @@ import builds.oss.*
 import builds.test.*
 import CloudProfile
 import co.elastic.teamcity.common.googleCloudProfile
+import isHourlyOnlyBranch
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.slackConnection
 import templates.KibanaTemplate
@@ -136,7 +137,16 @@ fun Kibana(config: KibanaConfiguration = KibanaConfiguration()) : Project {
 
  buildType(FullCi)
  buildType(BaselineCi)
- buildType(HourlyCi)
+
+ // master and 7.x get committed to so often, we only want to run full CI for them hourly
+ // but for other branches, we can run daily and on merge
+ if (isHourlyOnlyBranch()) {
+ buildType(HourlyCi)
+ } else {
+ buildType(DailyCi)
+ buildType(OnMergeCi)
+ }
+
  buildType(PullRequestCi)
  }
 

docs/index.asciidoc

@@ -7,7 +7,7 @@
 :blog-ref: https://www.elastic.co/blog/
 :wikipedia: https://en.wikipedia.org/wiki
 
-include::{docs-root}/shared/versions/stack/7.10.asciidoc[]
+include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
 :docker-repo: docker.elastic.co/kibana/kibana
 :docker-image: docker.elastic.co/kibana/kibana:{version}

docs/management/advanced-options.asciidoc

@@ -458,7 +458,7 @@ of buckets to try to represent.
 
 [horizontal]
 [[visualization-visualize-chartslibrary]]`visualization:visualize:legacyChartsLibrary`::
-Enables legacy charts library for area, line and bar charts in visualize. Currently, only legacy charts library supports split chart aggregation.
+Enables legacy charts library for area, line and bar charts in visualize.
 
 [[visualization-colormapping]]`visualization:colorMapping`::
 **This setting is deprecated and will not be supported as of 8.0.**

docs/management/managing-tags.asciidoc

@@ -37,8 +37,7 @@ Create a tag to assign to your saved objects.
 image::images/tags/create-tag.png[Tag creation popin]
 . Enter a name and select a color for the new tag.
 +
-The name can include alphanumeric characters (English letters and digits), `:`, `-`, `_` and the space character,
-and cannot be longer than 50 characters.
+The name cannot be longer than 50 characters.
 . Click *Create tag*.
 
 [float]