elastic · cuff-links · Nov 15, 2018 · Oct 29, 2018 · Oct 29, 2018 · Oct 29, 2018
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,5 +1,5 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "6.x", "checked": true }, "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
+  "branches": [{ "name": "6.x", "checked": true }, "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
   "labels": ["backport"]
 }
diff --git a/.ci/jobs.yml b/.ci/jobs.yml
@@ -0,0 +1,7 @@
+JOB:
+  - selenium
+  - intake
+  - x-pack
+
+# `~` is yaml for `null`
+exclude: ~
diff --git a/.ci/run.sh b/.ci/run.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -e
+
+# move to Kibana root
+cd "$(dirname "$0")/.."
+
+case "$JOB" in
+"selenium")
+  ./test/scripts/jenkins_selenium.sh
+  ;;
+"intake")
+  ./test/scripts/jenkins_unit.sh
+  ;;
+"x-pack")
+  ./test/scripts/jenkins_xpack.sh
+  ;;
+*)
+  echo "JOB '$JOB' is not implemented."
+  exit 1
+  ;;
+esac
diff --git a/.eslintignore b/.eslintignore
@@ -29,6 +29,6 @@ bower_components
 /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/*
+/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 **/*.js.snap
 !/.eslintrc.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -32,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/**/*',
@@ -314,6 +315,19 @@ module.exports = {
       },
     },
 
+    /**
+     * disable jsx-a11y for kbn-ui-framework
+     */
+    {
+      files: ['packages/kbn-ui-framework/**'],
+      rules: {
+        'jsx-a11y/click-events-have-key-events': 'off',
+        'jsx-a11y/anchor-has-content': 'off',
+        'jsx-a11y/tabindex-no-positive': 'off',
+        'jsx-a11y/aria-role': 'off',
+      },
+    },
+
     /**
      * Monitoring overrides
      */
@@ -392,20 +406,10 @@ module.exports = {
         ],
       },
     },
-    {
-      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/scripts/*.js',
         'x-pack/plugins/canvas/tasks/*.js',
         'x-pack/plugins/canvas/tasks/**/*.js',
         'x-pack/plugins/canvas/__tests__/**/*',
@@ -417,7 +421,6 @@ module.exports = {
           {
             devDependencies: true,
             peerDependencies: true,
-            packageDir: './x-pack/',
           },
         ],
       },
@@ -426,12 +429,6 @@ module.exports = {
       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',
           {
@@ -440,5 +437,17 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['x-pack/plugins/canvas/public/**/*'],
+      env: {
+        browser: true,
+      },
+    },
+    {
+      files: ['x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*'],
+      env: {
+        jquery: true,
+      },
+    },
   ],
 };
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,6 @@
 # GitHub CODEOWNERS definition
 # See: https://help.github.com/articles/about-codeowners/
 
+/x-pack/plugins/apm/  @elastic/apm-ui
 /x-pack/plugins/security/  @elastic/kibana-security
+**/*.scss  @elastic/kibana-design
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.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)
+
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -1,11 +1,27 @@
 {
   "paths": {
     "common.ui": "src/ui",
-    "inputControl":"src/core_plugins/input_control_vis",
+    "console": "src/core_plugins/console",
+    "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",
+    "vega": "src/core_plugins/vega",
+    "tableVis": "src/core_plugins/table_vis",
+    "regionMap": "src/core_plugins/region_map",
     "statusPage": "src/core_plugins/status_page",
-    "xpack.idxMgmt": "x-pack/plugins/index_management"
+    "tileMap": "src/core_plugins/tile_map",
+    "timelion": "src/core_plugins/timelion",
+    "tagCloud": "src/core_plugins/tagcloud",
+    "xpack.grokDebugger": "x-pack/plugins/grokdebugger",
+    "xpack.idxMgmt": "x-pack/plugins/index_management",
+    "xpack.licenseMgmt": "x-pack/plugins/license_management",
+    "xpack.monitoring": "x-pack/plugins/monitoring",
+    "xpack.rollupJobs": "x-pack/plugins/rollup",
+    "xpack.searchProfiler": "x-pack/plugins/searchprofiler",
+    "xpack.security": "x-pack/plugins/security",
+    "xpack.watcher": "x-pack/plugins/watcher"
   },
   "exclude": [
     "src/ui/ui_render/bootstrap/app_bootstrap.js",

diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1 @@
+--ignore-workspace-root-check true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -22,6 +22,7 @@ A high level overview of our contributing guidelines.
     - [Setting Up SSL](#setting-up-ssl)
   - [Linting](#linting)
   - [Testing and Building](#testing-and-building)
+    - [Debugging server code](#debugging-server-code)
   - [Debugging Unit Tests](#debugging-unit-tests)
   - [Unit Testing Plugins](#unit-testing-plugins)
   - [Cross-browser compatibility](#cross-browser-compatibility)
@@ -30,6 +31,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 +191,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.
 
@@ -279,7 +282,7 @@ macOS users on a machine with a discrete graphics card may see significant speed
 - 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.
+`yarn debug` will start the server with Node's inspect flag. Kibana's development mode will start three processes on ports `9229`, `9230`, and `9231`. Chrome's developer tools need to be configured to connect to all three connections. Add `localhost:<port>` for each Kibana process in Chrome's developer tools connection tab.
 
 ### Unit testing frameworks
 Kibana 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.
@@ -405,6 +408,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.

diff --git a/STYLEGUIDE.md b/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.