Merge branch 'master' into issues/20894

.browserslistrc

@@ -0,0 +1,3 @@
+last 2 versions
+> 5%
+Safari 7

.eslintignore

@@ -27,5 +27,8 @@ bower_components
 /x-pack/coverage
 /x-pack/build
 /x-pack/plugins/**/__tests__/fixtures/**
+/x-pack/plugins/canvas/common/lib/grammar.js
+/x-pack/plugins/canvas/canvas_plugin
+/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/*
 **/*.js.snap
 !/.eslintrc.js

.eslintrc.js

@@ -2,6 +2,8 @@ const { resolve } = require('path');
 const { readdirSync } = require('fs');
 const dedent = require('dedent');
 
+const restrictedModules = { paths: ['gulp-util'] };
+
 module.exports = {
   extends: ['@elastic/eslint-config-kibana', '@elastic/eslint-config-kibana/jest'],
 
@@ -17,6 +19,11 @@ module.exports = {
     },
   },
 
+  rules: {
+    'no-restricted-imports': [2, restrictedModules],
+    'no-restricted-modules': [2, restrictedModules],
+  },
+
   overrides: [
     /**
      * Prettier
@@ -25,6 +32,7 @@ module.exports = {
       files: [
         '.eslintrc.js',
         'packages/eslint-plugin-kibana-custom/**/*',
+        'packages/kbn-config-schema/**/*',
         'packages/kbn-pm/**/*',
         'packages/kbn-es/**/*',
         'packages/kbn-datemath/**/*',
@@ -116,7 +124,7 @@ module.exports = {
         'packages/kbn-ui-framework/generator-kui/**/*',
         'packages/kbn-ui-framework/Gruntfile.js',
         'packages/kbn-es/src/**/*',
-        'x-pack/{dev-tools,gulp_helpers,scripts,test,build_chromium}/**/*',
+        'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*',
         'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*',
         'x-pack/**/*.test.js',
         'x-pack/gulpfile.js',
@@ -323,5 +331,115 @@ module.exports = {
       files: ['x-pack/plugins/monitoring/public/**/*'],
       env: { browser: true },
     },
+
+    /**
+     * Canvas overrides
+     */
+    {
+      files: ['x-pack/plugins/canvas/**/*'],
+      plugins: ['prettier'],
+      rules: {
+        // preferences
+        'comma-dangle': [2, 'always-multiline'],
+        'no-multiple-empty-lines': [2, { max: 1, maxEOF: 1 }],
+        'no-multi-spaces': 2,
+        radix: 2,
+        curly: [2, 'multi-or-nest', 'consistent'],
+
+        // annoying rules that conflict with prettier
+        'space-before-function-paren': 0,
+        indent: 0,
+        'wrap-iife': 0,
+        'max-len': 0,
+
+        // module importing
+        'import/order': [
+          2,
+          { groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'] },
+        ],
+        'import/extensions': [2, 'never', { json: 'always', less: 'always', svg: 'always' }],
+
+        // prettier
+        'prettier/prettier': 2,
+
+        // react
+        'jsx-quotes': 2,
+        'react/no-did-mount-set-state': 2,
+        'react/no-did-update-set-state': 2,
+        'react/no-multi-comp': [2, { ignoreStateless: true }],
+        'react/self-closing-comp': 2,
+        'react/sort-comp': 2,
+        'react/jsx-boolean-value': 2,
+        'react/jsx-wrap-multilines': 2,
+        'react/no-unescaped-entities': [2, { forbid: ['>', '}'] }],
+        'react/forbid-elements': [
+          2,
+          {
+            forbid: [
+              {
+                element: 'EuiConfirmModal',
+                message: 'Use <ConfirmModal> instead',
+              },
+              {
+                element: 'EuiPopover',
+                message: 'Use <Popover> instead',
+              },
+              {
+                element: 'EuiIconTip',
+                message: 'Use <TooltipIcon> instead',
+              },
+            ],
+          },
+        ],
+      },
+    },
+    {
+      files: ['x-pack/plugins/canvas/*', 'x-pack/plugins/canvas/**/*'],
+      rules: {
+        'import/no-extraneous-dependencies': [
+          'error',
+          {
+            packageDir: './x-pack/',
+          },
+        ],
+      },
+    },
+    {
+      files: [
+        'x-pack/plugins/canvas/gulpfile.js',
+        'x-pack/plugins/canvas/tasks/*.js',
+        'x-pack/plugins/canvas/tasks/**/*.js',
+        'x-pack/plugins/canvas/__tests__/**/*',
+        'x-pack/plugins/canvas/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*',
+      ],
+      rules: {
+        'import/no-extraneous-dependencies': [
+          'error',
+          {
+            devDependencies: true,
+            peerDependencies: true,
+            packageDir: './x-pack/',
+          },
+        ],
+      },
+    },
+    {
+      files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*'],
+      globals: { canvas: true, $: true },
+      rules: {
+        'import/no-extraneous-dependencies': [
+          'error',
+          {
+            packageDir: './x-pack/',
+          },
+        ],
+        'import/no-unresolved': [
+          'error',
+          {
+            ignore: ['!!raw-loader.+.svg$'],
+          },
+        ],
+      },
+    },
   ],
 };

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+# GitHub CODEOWNERS definition
+# See: https://help.github.com/articles/about-codeowners/
+
+/x-pack/plugins/security/  @elastic/kibana-security

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,19 @@
-<!--
-Thank you for your interest in and contributing to Kibana! There
-are a few simple things to check before submitting your pull request
-that can help with the review process. You should delete these items
-from your submission, but they are here to help bring them to your
-attention.
-
-- Have you signed the [contributor license agreement](https://www.elastic.co/contributor-agreement)?
-- Have you followed the [contributor guidelines](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md)?
-- If submitting code, have you included unit tests that cover the changes?
-- If submitting code, have you tested and built your code locally prior to submission with `yarn test && yarn build`?
-- If submitting code, is your pull request against master? Unless there is a good reason otherwise, we prefer pull requests against master and will backport as needed.
--->
+## Summary
+
+Summarize your PR. If it involves visual changes include a screenshot or gif.
+
+### Checklist
+
+Use ~~strikethroughs~~ to remove checklist items you don't feel are applicable to this PR.
+
+- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)
+- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)
+- [ ] [Documentation](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#writing-documentation) was added for features that require explanation or tutorials
+- [ ] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios
+- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
+
+### For maintainers
+
+- [ ] This was checked for breaking API changes and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)
+- [ ] This includes a feature addition or change that requires a release note and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)
+

.gitignore

@@ -42,4 +42,4 @@ package-lock.json
 .vscode
 npm-debug.log*
 .tern-project
-index.css
+**/public/index.css

.i18nrc.json

@@ -0,0 +1,19 @@
+{
+  "paths": {
+    "common.ui": "src/ui",
+    "inputControl":"src/core_plugins/input_control_vis",
+    "kbn": "src/core_plugins/kibana",
+    "kbnVislibVisTypes": "src/core_plugins/kbn_vislib_vis_types",
+    "markdownVis": "src/core_plugins/markdown_vis",
+    "metricVis": "src/core_plugins/metric_vis",
+    "statusPage": "src/core_plugins/status_page",
+    "tagCloud": "src/core_plugins/tagcloud",
+    "xpack.idxMgmt": "x-pack/plugins/index_management"
+  },
+  "exclude": [
+    "src/ui/ui_render/bootstrap/app_bootstrap.js",
+    "src/ui/ui_render/ui_render_mixin.js",
+    "x-pack/plugins/monitoring/public/components/cluster/overview/alerts_panel.js",
+    "x-pack/plugins/monitoring/public/directives/alerts/index.js"
+  ]
+}

.node-version

@@ -1 +1 @@
-8.11.3
+8.11.4

.nvmrc

@@ -1 +1 @@
-8.11.3
+8.11.4

CONTRIBUTING.md

@@ -30,6 +30,7 @@ A high level overview of our contributing guidelines.
       - [Browser Automation Notes](#browser-automation-notes)
   - [Building OS packages](#building-os-packages)
   - [Writing documentation](#writing-documentation)
+  - [Release Notes Process](#release-notes-process)
 - [Signing the contributor license agreement](#signing-the-contributor-license-agreement)
 - [Submitting a Pull Request](#submitting-a-pull-request)
 - [Code Reviewing](#code-reviewing)
@@ -189,9 +190,10 @@ node scripts/makelogs
 > Make sure to execute `node scripts/makelogs` *after* elasticsearch is up and running!
 
 Start the development server.
-  ```bash
-  yarn start
-  ```
+
+```bash
+yarn start
+```
 
 > On Windows, you'll need you use Git Bash, Cygwin, or a similar shell that exposes the `sh` command.  And to successfully build you'll need Cygwin optional packages zip, tar, and shasum.
 
@@ -271,6 +273,13 @@ You can get all build options using the following command:
 yarn build --help
 ```
 
+macOS users on a machine with a discrete graphics card may see significant speedups (up to 2x) when running tests by changing your terminal emulator's GPU settings. In iTerm2:
+- Open Preferences (Command + ,)
+- In the General tab, under the "Magic" section, ensure "GPU rendering" is checked
+- Open "Advanced GPU Settings..."
+- Uncheck the "Prefer integrated to discrete GPU" option
+- Restart iTerm
+
 ### Debugging Server Code
 `yarn debug` will start the server with Node's inspect flag.  Kibana's development mode will start three processes.  Chrome's developer tools can be configured to connect to all three under the connection tab.
 
@@ -398,6 +407,31 @@ README for getting the docs tooling set up.
 node scripts/docs.js --open
 ```
 
+### Release Notes Process
+
+Part of this process only applies to maintainers, since it requires access to Github labels.
+
+Kibana publishes major, minor and patch releases periodically through the year. During this process we run a script against this repo to collect the applicable PRs against that release and generate [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html). To include your change in the Release Notes:
+
+1. In the title, summarize what the PR accomplishes in language that is meaningful to the user.  In general, use present tense (for example, Adds, Fixes) in sentence case.
+1. Label the PR with the targeted version (ex: 6.5).
+1. Label the PR with the appropriate github labels:
+    * For a new feature or functionality, use `release_note:enhancement`.
+    * For an external-facing fix, use `release_note:fix`.  Exception: docs, build, and test fixes do not go in the Release Notes.
+    * For a deprecated feature, use `release_note:deprecation`.
+    * For a breaking change, use `release-breaking:note`.
+
+We also produce a blog post that details more important breaking API changes every minor and major release. If the PR includes a breaking API change, apply the label `release_note:dev_docs`. Additionally add a brief summary of the break at the bottom of the PR using the format below:
+
+
+```
+# Dev Docs
+
+## Name the feature with the break (ex: Visualize Loader)
+
+Summary of the change. Anything Under `#Dev Docs` will be used in the blog.
+```
+
 ## Signing the contributor license agreement
 
 Please make sure you have signed the [Contributor License Agreement](http://www.elastic.co/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once.

NOTICE.txt

@@ -103,6 +103,33 @@ 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 childnode-remove which is available under a
+"MIT" license.
+
+The MIT License (MIT)
+
+Copyright (c) 2016-present, jszhou
+https://github.com/jserz/js_piece
+
+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 geohash.js which is available under a
 "MIT" license.  For details, see src/ui/public/utils/decode_geo_hash.js.
@@ -158,25 +185,3 @@ 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 uses "radioactive button" styles that were published on
-https://zurb.com/playground/radioactive-buttons under an "MIT" License.
-
-Copyright (c) ZURB
-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.
-

STYLEGUIDE.md

@@ -22,3 +22,7 @@ All filenames should use `snake_case`.
 
 *Wrong:*
   - `src/kibana/IndexPatterns/IndexPattern.js`
+
+## TypeScript vs JavaScript
+
+Whenever possible, write code in TypeScript instead of javascript, especially if it's new code.  Check out [TYPESCRIPT.md](TYPESCRIPT.md) for help with this process.