Merge remote-tracking branch 'upstream/master' into feature/reporting…

…/csv-export-panel-action

.eslintignore

@@ -18,7 +18,6 @@ bower_components
 /src/core/lib/kbn_internal_native_observable
 /packages/*/target
 /packages/eslint-config-kibana
-/packages/eslint-plugin-kibana-custom
 /packages/kbn-es-query/src/kuery/ast/kuery.js
 /packages/kbn-es-query/src/kuery/ast/legacy_kuery.js
 /packages/kbn-pm/dist

.eslintrc.js

@@ -34,6 +34,7 @@ const ELASTIC_LICENSE_HEADER = `
 
 module.exports = {
   extends: ['@elastic/eslint-config-kibana', '@elastic/eslint-config-kibana/jest'],
+  plugins: ['@kbn/eslint-plugin-eslint'],
 
   settings: {
     'import/resolver': {
@@ -46,6 +47,15 @@ module.exports = {
   rules: {
     'no-restricted-imports': [2, restrictedModules],
     'no-restricted-modules': [2, restrictedModules],
+    '@kbn/eslint/module_migration': [
+      'error',
+      [
+        {
+          from: 'expect.js',
+          to: '@kbn/expect',
+        },
+      ],
+    ],
   },
 
   overrides: [
@@ -55,7 +65,7 @@ module.exports = {
     {
       files: [
         '.eslintrc.js',
-        'packages/eslint-plugin-kibana-custom/**/*',
+        'packages/kbn-eslint-plugin-eslint/**/*',
         'packages/kbn-config-schema/**/*',
         'packages/kbn-pm/**/*',
         'packages/kbn-es/**/*',
@@ -87,7 +97,7 @@ module.exports = {
     {
       files: ['x-pack/test/functional/apps/**/*', 'x-pack/plugins/apm/**/*'],
       rules: {
-        'kibana-custom/no-default-export': 'off',
+        '@kbn/eslint/no-default-export': 'off',
         'import/no-named-as-default': 'off',
       },
     },
@@ -242,7 +252,7 @@ module.exports = {
         'packages/kbn-plugin-generator/**/*',
         'packages/kbn-plugin-helpers/**/*',
         'packages/kbn-eslint-import-resolver-kibana/**/*',
-        'packages/kbn-eslint-plugin-license-header/**/*',
+        'packages/kbn-eslint-plugin-eslint/**/*',
         'x-pack/gulpfile.js',
         'x-pack/dev-tools/mocha/setup_mocha.js',
         'x-pack/scripts/*',
@@ -267,15 +277,14 @@ module.exports = {
      */
     {
       files: ['**/*.js'],
-      plugins: ['@kbn/eslint-plugin-license-header'],
       rules: {
-        '@kbn/license-header/require-license-header': [
+        '@kbn/eslint/require-license-header': [
           'error',
           {
             license: APACHE_2_0_LICENSE_HEADER,
           },
         ],
-        '@kbn/license-header/disallow-license-headers': [
+        '@kbn/eslint/disallow-license-headers': [
           'error',
           {
             licenses: [ELASTIC_LICENSE_HEADER],
@@ -289,15 +298,14 @@ module.exports = {
      */
     {
       files: ['x-pack/**/*.js'],
-      plugins: ['@kbn/eslint-plugin-license-header'],
       rules: {
-        '@kbn/license-header/require-license-header': [
+        '@kbn/eslint/require-license-header': [
           'error',
           {
             license: ELASTIC_LICENSE_HEADER,
           },
         ],
-        '@kbn/license-header/disallow-license-headers': [
+        '@kbn/eslint/disallow-license-headers': [
           'error',
           {
             licenses: [APACHE_2_0_LICENSE_HEADER],

NOTICE.txt

@@ -80,32 +80,6 @@ used. Logarithmic ticks are places at powers of ten and at half those
 values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
 For details,  see https://github.com/flot/flot/pull/1328
 
----
-This product bundles [email protected] which is available under a
-"MIT" license.
-
-The MIT License
-
-Copyright (c) 2012-2014 the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
 ---
 This product bundles [email protected] which is available under a
 "MIT" license.

TYPESCRIPT.md

@@ -111,7 +111,7 @@ If yarn doesn't find the module it may not have types.  For example, our `rison_
 
 1. Contribute types into the DefinitelyTyped repo itself, or
 2. Create a top level `types` folder and point to that in the tsconfig. For example, Infra team already handled this for `rison_node` and added: `x-pack/plugins/infra/types/rison_node.d.ts`. Other code uses it too so we will need to pull it up. Or,
-3. Add a `// @ts-ignore` line above the import. This should be used minimally, the above options are better. However, sometimes you have to resort to this method. For example, the `expect.js` module will require this line. We don't have type definitions installed for this library. Installing these types would conflict with the jest typedefs for expect, and since they aren't API compatible with each other, it's not possible to make both test frameworks happy. Since we are moving from mocha => jest, we don't see this is a big issue.
+3. Add a `// @ts-ignore` line above the import. This should be used minimally, the above options are better. However, sometimes you have to resort to this method.
 
 ### TypeScripting react files
 

docs/CHANGELOG.asciidoc

@@ -1,8 +1,5 @@
 [[release-notes]]
-= {kib} Release Notes
-++++
-<titleabbrev>Release Notes</titleabbrev>
-++++
+= Release Notes
 
 [partintro]
 --

docs/development/core-development.asciidoc

@@ -5,6 +5,7 @@
 * <<development-dependencies>>
 * <<development-modules>>
 * <<development-elasticsearch>>
+* <<development-unit-tests>>
 * <<development-functional-tests>>
 
 include::core/development-basepath.asciidoc[]
@@ -15,4 +16,6 @@ include::core/development-modules.asciidoc[]
 
 include::core/development-elasticsearch.asciidoc[]
 
+include::core/development-unit-tests.asciidoc[]
+
 include::core/development-functional-tests.asciidoc[]

docs/development/core/development-functional-tests.asciidoc

@@ -82,7 +82,7 @@ Use the `--help` flag for more options.
 [float]
 ===== Environment
 
-The tests are written in https://mochajs.org[mocha] using https://github.com/Automattic/expect.js[expect] for assertions.
+The tests are written in https://mochajs.org[mocha] using https://github.com/elastic/kibana/tree/master/packages/kbn-expect[@kbn/expect] for assertions.
 
 We use https://sites.google.com/a/chromium.org/chromedriver/[chromedriver], https://theintern.github.io/leadfoot[leadfoot], and https://github.com/theintern/digdug[digdug] for automating Chrome. When the `FunctionalTestRunner` launches, digdug opens a `Tunnel` which starts chromedriver and a stripped-down instance of Chrome. It also creates an instance of https://theintern.github.io/leadfoot/module-leadfoot_Command.html[Leadfoot's `Command`] class, which is available via the `remote` service. The `remote` communicates to Chrome through the digdug `Tunnel`. See the https://theintern.github.io/leadfoot/module-leadfoot_Command.html[leadfoot/Command API] docs for all the commands you can use with `remote`.
 
@@ -122,11 +122,11 @@ A test suite is a collection of tests defined by calling `describe()`, and then
 [float]
 ===== Anatomy of a test file
 
-The annotated example file below shows the basic structure every test suite uses. It starts by importing https://github.com/Automattic/expect.js[`expect.js`] and defining its default export: an anonymous Test Provider. The test provider then destructures the Provider API for the `getService()` and `getPageObjects()` functions. It uses these functions to collect the dependencies of this suite. The rest of the test file will look pretty normal to mocha.js users. `describe()`, `it()`, `before()` and the lot are used to define suites that happen to automate a browser via services and objects of type `PageObject`.
+The annotated example file below shows the basic structure every test suite uses. It starts by importing https://github.com/elastic/kibana/tree/master/packages/kbn-expect[`@kbn/expect`] and defining its default export: an anonymous Test Provider. The test provider then destructures the Provider API for the `getService()` and `getPageObjects()` functions. It uses these functions to collect the dependencies of this suite. The rest of the test file will look pretty normal to mocha.js users. `describe()`, `it()`, `before()` and the lot are used to define suites that happen to automate a browser via services and objects of type `PageObject`.
 
 ["source","js"]
 ----
-import expect from 'expect.js';
+import expect from '@kbn/expect';
 // test files must `export default` a function that defines a test suite
 export default function ({ getService, getPageObject }) {
 

docs/development/core/development-unit-tests.asciidoc

@@ -0,0 +1,83 @@
+[[development-unit-tests]]
+=== Unit Testing
+
+We use unit tests to make sure that individual software units of {kib} perform as they were designed to.
+
+[float]
+=== Current Frameworks
+
+{kib} is migrating unit testing from `Mocha` to `Jest`. Legacy unit tests still exist in `Mocha` but all new unit tests should be written in `Jest`.
+
+[float]
+==== Mocha (legacy)
+
+Mocha tests are contained in `__tests__` directories.
+
+*Running Mocha Unit Tests*
+
+["source","shell"]
+-----------
+yarn test:mocha
+-----------
+
+[float]
+==== Jest
+Jest tests are stored in the same directory as source code files with the `.test.{js,ts,tsx}` suffix.
+
+*Running Jest Unit Tests*
+
+["source","shell"]
+-----------
+yarn test:jest
+-----------
+
+[float]
+===== Writing Jest Unit Tests
+
+In order to write those tests there are two main things you need to be aware of.
+The first one is the different between `jest.mock` and `jest.doMock` 
+and the second one our `jest mocks file pattern`. As we are running `js` and `ts`
+test files with `babel-jest` both techniques are needed
+specially for the tests implemented on Typescript in order to benefit from the 
+auto-inference types feature.
+
+[float]
+===== Jest.mock vs Jest.doMock
+
+Both methods are essentially the same on their roots however the `jest.mock` 
+calls will get hoisted to the top of the file and can only reference variables 
+prefixed with `mock`. On the other hand, `jest.doMock` won't be hoisted and can 
+reference pretty much any variable we want, however we have to assure those referenced 
+variables are instantiated at the time we need them which lead us to the next 
+section where we'll talk about our jest mock files pattern.
+
+[float]
+===== Jest Mock Files Pattern 
+
+Specially on typescript it is pretty common to have in unit tests 
+`jest.doMock` calls which reference for example imported types. Any error 
+will thrown from doing that however the test will fail. The reason behind that
+is because despite the `jest.doMock` isn't being hoisted by `babel-jest` the 
+import with the types we are referencing will be hoisted to the top and at the 
+time we'll call the function that variable would not be defined.
+
+In order to prevent that we develop a protocol that should be followed:
+
+- Each module could provide a standard mock in `mymodule.mock.ts` in case 
+there are other tests that could benefit from using definitions here. 
+This file would not have any `jest.mock` calls, just dummy objects.
+
+- Each test defines its mocks in `mymodule.test.mocks.ts`. This file 
+could import relevant mocks from the generalised module's mocks 
+file `(*.mock.ts)` and call `jest.mock` for each of them. If there is 
+any relevant dummy mock objects to generalise (and to be used by 
+other tests), the dummy objects could be defined directly on this file.
+
+- Each test would import its mocks from the test mocks 
+file mymodule.test.mocks.ts. `mymodule.test.ts` has an import 
+like: `import * as Mocks from './mymodule.test.mocks'`, 
+`import { mockX } from './mymodule.test.mocks'` 
+or just `import './mymodule.test.mocks'` if there isn't anything 
+exported to be used.
+
+

docs/getting-started/tutorial-load-dataset.asciidoc

@@ -3,12 +3,16 @@
 
 This tutorial requires three data sets:
 
-* The complete works of William Shakespeare, suitably parsed into fields. Download
-  https://download.elastic.co/demos/kibana/gettingstarted/shakespeare_6.0.json[`shakespeare.json`].
-* A set of fictitious accounts with randomly generated data. Download
-  https://download.elastic.co/demos/kibana/gettingstarted/accounts.zip[`accounts.zip`].
-* A set of randomly generated log files. Download
-  https://download.elastic.co/demos/kibana/gettingstarted/logs.jsonl.gz[`logs.jsonl.gz`].
+* The complete works of William Shakespeare, suitably parsed into fields
+* A set of fictitious accounts with randomly generated data
+* A set of randomly generated log files
+
+Create a new working directory where you want to download the files. From that directory, run the following commands:
+
+[source,shell]
+curl -O https://download.elastic.co/demos/kibana/gettingstarted/8.x/shakespeare.json
+curl -O https://download.elastic.co/demos/kibana/gettingstarted/8.x/accounts.zip
+curl -O https://download.elastic.co/demos/kibana/gettingstarted/8.x/logs.jsonl.gz
 
 Two of the data sets are compressed. To extract the files, use these commands:
 
@@ -73,16 +77,14 @@ In Kibana *Dev Tools > Console*, set up a mapping for the Shakespeare data set:
 [source,js]
 PUT /shakespeare
 {
- "mappings": {
-  "doc": {
-   "properties": {
+  "mappings": {
+    "properties": {
     "speaker": {"type": "keyword"},
     "play_name": {"type": "keyword"},
     "line_id": {"type": "integer"},
     "speech_number": {"type": "integer"}
-   }
+    }
   }
- }
 }
 
 //CONSOLE
@@ -100,13 +102,11 @@ as geographic locations by applying the `geo_point` type.
 PUT /logstash-2015.05.18
 {
   "mappings": {
-    "log": {
-      "properties": {
-        "geo": {
-          "properties": {
-            "coordinates": {
-              "type": "geo_point"
-            }
+    "properties": {
+      "geo": {
+        "properties": {
+          "coordinates": {
+            "type": "geo_point"
           }
         }
       }
@@ -120,13 +120,11 @@ PUT /logstash-2015.05.18
 PUT /logstash-2015.05.19
 {
   "mappings": {
-    "log": {
-      "properties": {
-        "geo": {
-          "properties": {
-            "coordinates": {
-              "type": "geo_point"
-            }
+    "properties": {
+      "geo": {
+        "properties": {
+          "coordinates": {
+            "type": "geo_point"
           }
         }
       }
@@ -140,13 +138,11 @@ PUT /logstash-2015.05.19
 PUT /logstash-2015.05.20
 {
   "mappings": {
-    "log": {
-      "properties": {
-        "geo": {
-          "properties": {
-            "coordinates": {
-              "type": "geo_point"
-            }
+    "properties": {
+      "geo": {
+        "properties": {
+          "coordinates": {
+            "type": "geo_point"
           }
         }
       }
@@ -165,13 +161,13 @@ API to load the data sets:
 
 [source,shell]
 curl -H 'Content-Type: application/x-ndjson' -XPOST 'localhost:9200/bank/account/_bulk?pretty' --data-binary @accounts.json
-curl -H 'Content-Type: application/x-ndjson' -XPOST 'localhost:9200/shakespeare/doc/_bulk?pretty' --data-binary @shakespeare_6.0.json
+curl -H 'Content-Type: application/x-ndjson' -XPOST 'localhost:9200/shakespeare/_bulk?pretty' --data-binary @shakespeare.json
 curl -H 'Content-Type: application/x-ndjson' -XPOST 'localhost:9200/_bulk?pretty' --data-binary @logs.jsonl
 
 Or for Windows users, in Powershell:
 [source,shell]
 Invoke-RestMethod "http://localhost:9200/bank/account/_bulk?pretty" -Method Post -ContentType 'application/x-ndjson' -InFile "accounts.json"
-Invoke-RestMethod "http://localhost:9200/shakespeare/doc/_bulk?pretty" -Method Post -ContentType 'application/x-ndjson' -InFile "shakespeare_6.0.json"
+Invoke-RestMethod "http://localhost:9200/shakespeare/_bulk?pretty" -Method Post -ContentType 'application/x-ndjson' -InFile "shakespeare.json"
 Invoke-RestMethod "http://localhost:9200/_bulk?pretty" -Method Post -ContentType 'application/x-ndjson' -InFile "logs.jsonl"
 
 These commands might take some time to execute, depending on the available computing resources.
@@ -187,8 +183,8 @@ Your output should look similar to this:
 
 [source,shell]
 health status index               pri rep docs.count docs.deleted store.size pri.store.size
-yellow open   bank                  5   1       1000            0    418.2kb        418.2kb
-yellow open   shakespeare           5   1     111396            0     17.6mb         17.6mb
-yellow open   logstash-2015.05.18   5   1       4631            0     15.6mb         15.6mb
-yellow open   logstash-2015.05.19   5   1       4624            0     15.7mb         15.7mb
-yellow open   logstash-2015.05.20   5   1       4750            0     16.4mb         16.4mb
+yellow open   bank                  1   1       1000            0    418.2kb        418.2kb
+yellow open   shakespeare           1   1     111396            0     17.6mb         17.6mb
+yellow open   logstash-2015.05.18   1   1       4631            0     15.6mb         15.6mb
+yellow open   logstash-2015.05.19   1   1       4624            0     15.7mb         15.7mb
+yellow open   logstash-2015.05.20   1   1       4750            0     16.4mb         16.4mb