Merge remote-tracking branch 'upstream/master' into elastic#19471

.ci/packer_cache.sh

@@ -13,6 +13,10 @@ cd "x-pack";
 yarn gulp prepare;
 cd -;
 
+# # cache the chromedriver bin
+# mkdir -p ".chromedriver/master"
+# cp node_modules/chromedriver/bin/chromedriver .chromedriver/master/
+
 # archive cacheable directories
 mkdir -p "$HOME/.kibana/bootstrap_cache"
 tar -cf "$HOME/.kibana/bootstrap_cache/master.tar" \
@@ -22,4 +26,5 @@ tar -cf "$HOME/.kibana/bootstrap_cache/master.tar" \
   x-pack/plugins/*/node_modules \
   x-pack/plugins/reporting/.chromium \
   test/plugin_functional/plugins/*/node_modules \
-  .es;
+  .es \
+  .chromedriver;

.eslintignore

@@ -7,12 +7,12 @@ bower_components
 /optimize
 /built_assets
 /src/fixtures/vislib/mock_data
-/src/ui/public/angular-bootstrap
-/src/ui/public/flot-charts
+/src/legacy/ui/public/angular-bootstrap
+/src/legacy/ui/public/flot-charts
 /test/fixtures/scenarios
 /src/legacy/core_plugins/console/public/webpackShims
 /src/legacy/core_plugins/console/public/tests/webpackShims
-/src/ui/public/utils/decode_geo_hash.js
+/src/legacy/ui/public/utils/decode_geo_hash.js
 /src/legacy/core_plugins/timelion/public/webpackShims/jquery.flot.*
 /src/core/lib/kbn_internal_native_observable
 /packages/*/target

.eslintrc.js

@@ -209,6 +209,7 @@ module.exports = {
     {
       files: [
         'test/functional/services/lib/leadfoot_element_wrapper/scroll_into_view_if_necessary.js',
+        '**/browser_exec_scripts/**/*',
       ],
       rules: {
         'prefer-object-spread/prefer-object-spread': 'off',
@@ -220,6 +221,7 @@ module.exports = {
           'ArrowFunctionExpression',
           'AwaitExpression',
           'ClassDeclaration',
+          'ImportDeclaration',
           'RestElement',
           'SpreadElement',
           'YieldExpression',
@@ -284,16 +286,6 @@ module.exports = {
       },
     },
 
-    /**
-     * X-Pack global overrides
-     */
-    {
-      files: ['x-pack/**/*'],
-      rules: {
-        quotes: 'off',
-      },
-    },
-
     /**
      * Files that require Elastic license headers instead of Apache 2.0 header
      */
@@ -366,7 +358,6 @@ module.exports = {
     {
       files: ['x-pack/plugins/ml/**/*'],
       rules: {
-        quotes: 'error',
         'no-shadow': 'error',
       },
     },

.github/CODEOWNERS

@@ -17,7 +17,7 @@
 # Security
 /x-pack/plugins/security/  @elastic/kibana-security
 /x-pack/plugins/spaces/  @elastic/kibana-security
-/src/server/csp/ @elastic/kibana-security
+/src/legacy/server/csp/ @elastic/kibana-security
 
 # Design
 **/*.scss  @elastic/kibana-design

.i18nrc.json

@@ -1,7 +1,7 @@
 {
   "paths": {
-    "common.ui": "src/ui",
-    "server": "src/server",
+    "common.ui": "src/legacy/ui",
+    "server": "src/legacy/server",
     "console": "src/legacy/core_plugins/console",
     "core": "src/core",
     "inputControl": "src/legacy/core_plugins/input_control_vis",
@@ -46,12 +46,14 @@
     "xpack.watcher": "x-pack/plugins/watcher"
   },
   "exclude": [
-    "src/core/public/fatal_errors/get_error_info.ts",
-    "src/ui/ui_render/bootstrap/app_bootstrap.js",
-    "src/ui/ui_render/ui_render_mixin.js",
+    "src/legacy/ui/ui_render/bootstrap/app_bootstrap.js",
+    "src/legacy/ui/ui_render/ui_render_mixin.js",
     "x-pack/plugins/infra/public/graphql/types.ts",
     "x-pack/plugins/infra/public/utils/loading_state/loading_result.ts",
     "x-pack/plugins/infra/server/graphql/types.ts",
     "x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts"
+  ],
+  "translations": [
+    "x-pack/plugins/translations/translations/zh-CN.json"
   ]
 }

.sass-lint.yml

@@ -1,5 +1,9 @@
 files:
   include:
+    - 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
+    - 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
+    - 'src/legacy/ui/public/query_bar/**/*.s+(a|c)ss'
+    - 'src/legacy/ui/public/vislib/**/*.s+(a|c)ss'
     - 'x-pack/plugins/rollup/**/*.s+(a|c)ss'
     - 'x-pack/plugins/security/**/*.s+(a|c)ss'
 rules:

CONTRIBUTING.md

@@ -172,15 +172,39 @@ yarn kbn bootstrap
 
 (You can also run `yarn kbn` to see the other available commands. For more info about this tool, see https://github.com/elastic/kibana/tree/master/packages/kbn-pm.)
 
-Start elasticsearch from a nightly snapshot.
+### Running Elasticsearch
+
+There are a few options when it comes to running Elasticsearch:
+
+First, you'll need to have a `java` binary in `PATH` and `JAVA_HOME` set. The version of Java required is specified in [.ci/java-version.properties](https://github.com/elastic/elasticsearch/blob/master/.ci/java-versions.properties) on the ES branch.
+
+**Nightly snapshot**
+
+These snapshots are built on a nightly basis which expire after a couple weeks. If running from an old, untracted branch this snapshot might not exist. In which case you might need to run from source or an archive.
 
 ```bash
 yarn es snapshot
 ```
 
-This will run Elasticsearch with a `basic` license. Additional options are available, pass `--help` for more information.
+**Source**
+
+By default, it will reference an [elasticsearch](https://github.com/elastic/elasticsearch) checkout which is a sibling to the Kibana directory named `elasticsearch`. If you wish to use a checkout in another location you can provide that by supplying `--source-path`
+
+```bash
+yarn es source
+```
+
+**Archive**
+
+Use this if you already have a distributable. For released versions, one can be obtained on the [Elasticsearch downloads](https://www.elastic.co/downloads/elasticsearch) page.
+
+```bash
+yarn es archive <full_path_to_archive>
+```
+
+
+Each of these will run Elasticsearch with a `basic` license. Additional options are available, pass `--help` for more information.
 
-> You'll need to have a `java` binary in `PATH` or set `JAVA_HOME`.
 
 If you're just getting started with `elasticsearch`, you could use the following command to populate your instance with a few fake logs to hit the ground running.
 

README.md

@@ -32,7 +32,7 @@ out an open PR:
 
 - [CONTRIBUTING.md](CONTRIBUTING.md) will help you get Kibana up and running.
 - If you would like to contribute code, please follow our [STYLEGUIDE.md](STYLEGUIDE.md).
-- Learn more about our UI code with [UI_SYSTEMS.md](src/ui/public/UI_SYSTEMS.md).
+- Learn more about our UI code with [UI_SYSTEMS.md](src/legacy/ui/public/UI_SYSTEMS.md).
 - For all other questions, check out the [FAQ.md](FAQ.md) and
 [wiki](https://github.com/elastic/kibana/wiki).