Merge Master back to secops

.ci/jobs.yml

@@ -0,0 +1,7 @@
+JOB:
+  - selenium
+  - intake
+  - x-pack
+
+# `~` is yaml for `null`
+exclude: ~

.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

.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

.eslintrc.js

@@ -315,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
      */
@@ -393,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__/**/*',
@@ -418,7 +421,6 @@ module.exports = {
           {
             devDependencies: true,
             peerDependencies: true,
-            packageDir: './x-pack/',
           },
         ],
       },
@@ -427,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',
           {
@@ -441,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,
+      },
+    },
   ],
 };

.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

.i18nrc.json

@@ -1,24 +1,32 @@
 {
-  "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",
-    "tableVis": "src/core_plugins/table_vis",
-    "regionMap": "src/core_plugins/region_map",
-    "statusPage": "src/core_plugins/status_page",
-    "tileMap": "src/core_plugins/tile_map",
-    "tagCloud": "src/core_plugins/tagcloud",
-    "xpack.idxMgmt": "x-pack/plugins/index_management",
-    "xpack.watcher": "x-pack/plugins/watcher",
-    "xpack.security": "x-pack/plugins/security"
-  },
-  "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"
-  ]
-}
+    "paths": {
+      "common.ui": "src/ui",
+      "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",
+      "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",
+      "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"
+    ]
+  }

.yarnrc

@@ -0,0 +1 @@
+--ignore-workspace-root-check true

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)
@@ -281,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.

docs/api/dashboard-import/export.asciidoc

@@ -13,7 +13,7 @@ index patterns.
 
 ==== Query Parameters
 
-`dashboard` (optional)::
+`dashboard` (required)::
   (array|string) The id(s) of the dashboard(s) to export
 
 ==== Response body

docs/api/role-management/put.asciidoc

@@ -50,7 +50,7 @@ PUT /api/security/role/my_kibana_role
         "grant" : [ "title", "body" ]
       },
       "query" : "{\"match\": {\"title\": \"foo\"}}"
-    } ],
+    } ]
   },
   "kibana": {
     "global": ["all"]
@@ -85,7 +85,7 @@ PUT /api/security/role/my_kibana_role
         "grant" : [ "title", "body" ]
       },
       "query" : "{\"match\": {\"title\": \"foo\"}}"
-    } ],
+    } ]
   },
   "kibana": {
     "global": [],
@@ -95,4 +95,4 @@ PUT /api/security/role/my_kibana_role
     }
   }
 }
---------------------------------------------------
+--------------------------------------------------

docs/canvas.asciidoc

@@ -0,0 +1,27 @@
+[[canvas]]
+= Canvas
+
+[partintro]
+--
+
+beta[]
+
+Congratulations on finding the Canvas application in {kib}. You are in for a treat. 
+Canvas is a whole new way of making data look amazing. Canvas combines data with 
+colors, shapes, text, and your own imagination to bring dynamic, multi-page, 
+pixel-perfect, data displays to screens large and small. 
+
+We made Canvas for people like us. We figure, you are probably people like us: 
+you make neat stuff and you want to show that neat stuff to others. Canvas is 
+for makers who are a little bit creative, a little bit technical, and whole lot 
+of curious.
+
+We've put together <<canvas-getting-started, this Getting Started>> to teach you 
+how to get the most out of Canvas. 
+
+--
+
+include::canvas/canvas-getting-started.asciidoc[]
+
+include::canvas/canvas-workpad.asciidoc[]
+

docs/canvas/canvas-getting-started.asciidoc

@@ -0,0 +1,31 @@
+[[canvas-getting-started]]
+== Getting started with Canvas
+
+beta[]Your best bet to getting started with Canvas is to check out one 
+(or all) of the sample data sets that ship with {kib}. 
+
+. Click the {kib} logo in the upper left hand corner of your browser to navigate 
+to the {kib} home page.
+. Click *Load a data set and a Kibana dashboard*. This also loads a 
+Canvas workpad to go with the data set.
+. Pick a data set. Let’s go with the eCommerce one for this example, but while you're 
+here, feel free to click *Add* on all of the available sample data sets.
+. Click the Canvas icon in the left hand navigation menu.
+. Find the *[eCommerce] Revenue Tracking* workpad and click on its name to open it.
+
+[role="screenshot"]
+image::images/canvas-ecommerce.png[]
+
+You’re in! The first thing to do is to make a copy of this 
+workpad so you can come back to it later if needed. We’ll be making a mess 
+of it in this tutorial. 
+
+. Click the name of the workpad in the lower left hand corner. 
++
+You’ll notice this is similar to the first screen. You could switch to a new 
+workpad from here, but let's not for now.
+
+. Click the *Clone* icon in the *[eCommerce] Revenue Tracking* row.
++
+You now have a new workpad called *[eCommerce] Revenue Tracking - Copy*.
+

docs/canvas/canvas-workpad.asciidoc

@@ -0,0 +1,48 @@
+[[canvas-workpad]]
+== Using the workpad
+
+beta[]Now that you have a workpad with sample data that you can mess with, let’s mess with it. 
+We’ll start out by making a few stylistic changes. 
+
+. Click the gauge chart in the top left of the workpad (fun fact, these are actually pie charts). 
+Try clicking on the small red slice. If you click the number, you'll notice that
+you’ve actually selected a number element, not the gauge itself. 
++ 
+This element is now selected. Off to the right, you'll see that the side bar has changed. 
+This is where you can make changes to the element.
++
+[role="screenshot"]
+image::images/canvas_workpad_edit_style.png[]
+
+. Try changing the color palette. Easy right? Click the Back button in your 
+browser to undo your change.
+
+. Try dragging the chart around the page. Grab the resize handles to make 
+the chart bigger and smaller.
+
+. Now click somewhere off of the element, but not on another element, 
+to deselect it. 
++
+You will notice the sidebar changing again. You now have 
+access to the page and workpad-level settings. Feel free to change the page 
+background color or rename your workpad.
+
+Speaking of pages, Canvas workpads can have multiple pages.
+
+. Click the arrow to the right of the *Page 1 of 2* text in the toolbar at the bottom
+of the page. You'll see a whole new view of the the eCommerce data.
+. Click the *Page 2 of 2* text to see a live preview of all of the pages in your 
+workpad.
+. Click the (+) button to create a new, blank page.
+. Click the *Add element* button in the top right hand corner of the page.
+. Add an *Area Chart.*
++
+[role="screenshot"]
+image::images/canvas_workpad_3_page.png[]
+
+You now have a three-page workpad, and a new element connected 
+to some demo data.  Your next step is to wire your new element 
+up to some real data; you can click on the *Data* tab in the right sidebar menu 
+and click "Change your data source" to start working with your Elasticsearch data.
+
+

docs/getting-started/tutorial-sample-data.asciidoc

@@ -25,8 +25,7 @@ In this tutorial, you’ll learn to:
 * Edit a visualization
 * Inspect the data behind the scenes
 
-NOTE: If security is enabled, you must have the `all` Kibana privilege.
-You must also have access to the `kibana_sample_data_flights` index with 
-the `read`, `write,` and `manage` privileges. See {xpack-ref}/security-privileges.html[Security Privileges] 
+NOTE: If security is enabled, you must have `read`, `write`, and `manage` privileges
+on the `kibana_sample_data_*` indices. See {xpack-ref}/security-privileges.html[Security Privileges] 
 for more information.
 

docs/index.asciidoc

@@ -24,7 +24,7 @@ include::introduction.asciidoc[]
 
 include::setup.asciidoc[]
 
-include::monitoring/monitoring-kibana.asciidoc[]
+include::monitoring/configuring-monitoring.asciidoc[]
 
 include::security/securing-kibana.asciidoc[]
 
@@ -40,6 +40,8 @@ include::dashboard.asciidoc[]
 
 include::timelion.asciidoc[]
 
+include::canvas.asciidoc[]
+
 include::ml/index.asciidoc[]
 
 include::apm/index.asciidoc[]

docs/limitations.asciidoc

@@ -6,7 +6,10 @@
 Kibana currently has the following limitations.
 
 * <<nested-objects>>
+* <<export-data>>
 
 --
 
 include::limitations/nested-objects.asciidoc[]
+
+include::limitations/export-data.asciidoc[]

docs/limitations/export-data.asciidoc

@@ -0,0 +1,5 @@
+[[export-data]]
+== Exporting data
+
+Exporting a data table or saved search from a dashboard or visualization report 
+has known limitations. The PDF report only includes the data visible on the screen.