Merge remote-tracking branch 'upstream/master' into geo-containment-l…

…atency-fix

.browserslistrc

@@ -2,10 +2,10 @@
 last 2 Firefox versions
 last 2 Chrome versions
 last 2 Safari versions
-> 0.25%
-not ie 11
-not op_mini all
-not samsung 4
+last 2 Edge versions
+last 1 ios_saf versions
+last 1 and_chr versions
+last 1 samsung versions
 
 [dev]
 last 1 chrome versions

.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://github.com/elastic/cloud) and added to the [docker list](https://github.com/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://github.com/elastic/cloud) and added to the [docker list](https://github.com/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)
     }
 

dev_docs/kibana_platform_plugin_intro.mdx

@@ -76,7 +76,7 @@ We recognize the need to better clarify the relationship between core functional
 The main difference between core functionality and functionality supplied by plugins, is in how it is accessed. Core is
 passed to plugins as the first parameter to their `start` and `setup` lifecycle functions, while plugin supplied functionality is passed as the
 second parameter.  Plugin dependencies must be declared explicitly inside the `kibana.json` file. Core functionality is always provided. Read the 
-section on [how plugins interact with eachother and core](#how-plugins-interact-with-each-other-and-core) for more information.
+section on <DocLink id="kibPlatformIntro" section="how-plugins-interact-with-each-other-and-core" text="how plugins interact with eachother and core"/> for more information.
 
 ## The anatomy of a plugin
 

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

@@ -134,11 +134,6 @@ The maximum numbers of buckets that a single data source can return. This might
 arise when the user selects a short interval (for example, 1s) for a long time
 period (1 year).
 
-[[pagenavigation]]`pageNavigation`::
-The style of navigation menu for Kibana. Choices are Legacy, the legacy style
-where every plugin is represented in the nav, and Modern, a new format that
-bundles related plugins together in flyaway nested navigation.
-
 [[query-allowleadingwildcards]]`query:allowLeadingWildcards`::
 Allows a wildcard (*) as the first character in a query clause. Only applies
 when experimental query features are enabled in the query bar. To disallow

docs/management/index-patterns.asciidoc

@@ -158,10 +158,13 @@ date values in {es}, you can use a {kib} field formatter to change the display t
 <<field-formatters-geopoint, geopoints>>,
 and <<field-formatters-numeric, numbers>>.
 
+To customize the displayed field name provided by {es}, you can 
+use *Custom Label* .
+
 A popularity counter keeps track of the fields you use most often.
 The top five most popular fields and their values are displayed in <<discover,*Discover*>>.
 
-To edit the field format and popularity counter, click the edit icon
+To edit the field display, click the edit icon
 (image:management/index-patterns/images/edit_icon.png[]) in the index pattern detail view.
 
 [role="screenshot"]

docs/management/managing-fields.asciidoc

@@ -18,6 +18,7 @@ To format a field:
 . Open the main menu, and click *Stack Management > Index Patterns*.
 . Click the index pattern that contains the field you want to format.
 . Find the field you want to format and click the edit icon (image:management/index-patterns/images/edit_icon.png[]).
+. Enter a custom label for the field, if needed.
 . Select a format and fill in the details.
 +
 [role="screenshot"]

package.json

@@ -98,7 +98,7 @@
     "@elastic/datemath": "link:packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary",
     "@elastic/ems-client": "7.11.0",
-    "@elastic/eui": "31.0.0",
+    "@elastic/eui": "31.3.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "^9.0.1-kibana3",
     "@elastic/node-crypto": "1.2.1",