Merge remote-tracking branch 'upstream/7.x' into 7.x

.ci/run.sh

@@ -5,6 +5,7 @@ set -e
 # move to Kibana root
 cd "$(dirname "$0")/.."
 
+source src/dev/ci_setup/load_env_keys.sh
 source src/dev/ci_setup/extract_bootstrap_cache.sh
 source src/dev/ci_setup/setup.sh
 source src/dev/ci_setup/checkout_sibling_es.sh

.eslintignore

@@ -25,6 +25,8 @@ bower_components
 /packages/kbn-ui-framework/dist
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
+/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
+/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
 /x-pack/legacy/plugins/maps/public/vendor/**
 /x-pack/coverage
 /x-pack/build

.eslintrc.js

@@ -186,8 +186,10 @@ module.exports = {
         'x-pack/legacy/plugins/apm/**/*.js',
         'test/*/config.ts',
         'test/visual_regression/tests/**/*',
-        'x-pack/test/visual_regression/tests/**/*',
-        'x-pack/test/*/config.ts',
+        'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
+        'x-pack/test/*/*config.*ts',
+        'x-pack/test/saved_object_api_integration/*/apis/**/*',
+        'x-pack/test/ui_capabilities/*/tests/**/*',
       ],
       rules: {
         'import/no-default-export': 'off',

.i18nrc.json

@@ -15,14 +15,14 @@
     "embeddableApi": "src/legacy/core_plugins/embeddable_api",
     "kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
     "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
-    "metricVis": "src/legacy/core_plugins/metric_vis",
+    "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
     "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
     "visTypeTable": "src/legacy/core_plugins/vis_type_table",
     "regionMap": "src/legacy/core_plugins/region_map",
     "statusPage": "src/legacy/core_plugins/status_page",
     "tileMap": "src/legacy/core_plugins/tile_map",
     "timelion": "src/legacy/core_plugins/timelion",
-    "tagCloud": "src/legacy/core_plugins/tagcloud",
+    "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "tsvb": "src/legacy/core_plugins/metrics",
     "kbnESQuery": "packages/kbn-es-query",
     "xpack.actions": "x-pack/legacy/plugins/actions",
@@ -58,7 +58,8 @@
     "xpack.spaces": "x-pack/legacy/plugins/spaces",
     "xpack.upgradeAssistant": "x-pack/legacy/plugins/upgrade_assistant",
     "xpack.uptime": "x-pack/legacy/plugins/uptime",
-    "xpack.watcher": "x-pack/legacy/plugins/watcher"
+    "xpack.watcher": "x-pack/legacy/plugins/watcher",
+    "inspector": "src/plugins/inspector"
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": [

NOTICE.txt

@@ -107,6 +107,39 @@ 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 includes code that is adapted from mapbox-gl-js, which is
+available under a "BSD-3-Clause" license.
+https://github.com/mapbox/mapbox-gl-js/blob/master/src/util/image.js
+
+Copyright (c) 2016, Mapbox
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of Mapbox GL JS nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ---
 This product includes code that is based on facebookincubator/idx, which was
 available under a "MIT" license.

docs/canvas/canvas-function-reference.asciidoc

@@ -1209,17 +1209,23 @@ Aliases: `label`, `text`, `description`
 
 Default: `""`
 
+|`labelFont`
+|`style`
+|The CSS font properties for the label. For example, `font-family` or `font-weight`.
+
+Default: `{font size=14 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`.
+
 |`metricFont`
 |`style`
 |The CSS font properties for the metric. For example, `font-family` or `font-weight`.
 
 Default: `{font size=48 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center lHeight=48}`.
 
-|`labelFont`
-|`style`
-|The CSS font properties for the label. For example, `font-family` or `font-weight`.
+|`metricFormat`
 
-Default: `{font size=14 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`.
+Alias: `format`
+|`string`
+|A NumeralJS format string. For example, `"0.0a"` or `"0%"`. See http://numeraljs.com/#format.
 |===
 
 *Returns:* `render`

docs/dashboard.asciidoc

@@ -3,66 +3,84 @@
 
 [partintro]
 --
-A Kibana _dashboard_ displays a collection of visualizations, searches, and {kibana-ref}/maps.html[maps].
-You can arrange, resize, and edit the dashboard content and then save the dashboard
-so you can share it.
 
-[role="screenshot"]
-image:images/Dashboard_example.png[Example dashboard]
+A {kib} _dashboard_ is a collection of visualizations, searches, and 
+maps, typically in real-time. Dashboards provide 
+at-a-glance insights into your data and enable you to drill down into details. 
 
---
+To start working with dashboards, click *Dashboard* in the side navigation. 
+With *Dashboard*, you can:
 
-[[dashboard-getting-started]]
-== Building a Dashboard
+* <<dashboard-create-new-dashboard, Create a dashboard>>
+* <<customizing-your-dashboard, Arrange dashboard elements>>
+* <<sharing-dashboards, Share a dashboard>>
+* <<import-dashboards, Import and export dashboards>>
+* <<viewing-detailed-information, Inspect and edit dashboard elements>>
+
+
+[role="screenshot"]
+image:images/Dashboard_example.png[Example dashboard]
 
-If you haven't yet indexed data into {es} or created an index pattern,
-you'll be prompted to do so as you follow the steps for creating a dashboard.
-Or, you can use one of the prebuilt sample data sets, available from the
-Kibana home page.
 
 [float]
 [[dashboard-read-only-access]]
 === [xpack]#Read only access#
-When you have insufficient privileges to create or save dashboards, the following 
-indicator in Kibana will be displayed. The buttons to create new dashboards or edit
-existing dashboard won't be visible. For more information on granting access to
-Kibana see <<xpack-security-authorization>>.
+If you see
+the read-only icon in the application header,
+then you don't have sufficient privileges to create and save dashboards. The buttons to create and edit
+dashboards are not visible. For more information, see <<xpack-security-authorization>>.
 
 [role="screenshot"]
 image::images/dashboard-read-only-badge.png[Example of Dashboard's read only access indicator in Kibana's header]
 
 [float]
+[[dashboard-getting-started]]
+=== Interact with dashboards
+
+When you open *Dashhboard*, you're presented an overview of your dashboards. 
+If you don't have any dashboards, you can add 
+<<add-sample-data, sample data sets>>,
+which include pre-built dashboards. 
+
+Once you open a dashboard, you can filter the data
+by entering a search query, changing the time filter, or clicking 
+in the visualizations, searches, and maps. If a dashboard element has a stored query, 
+both queries are applied.
+
+--
+
 [[dashboard-create-new-dashboard]]
-=== Creating a new Dashboard
+== Create a dashboard
+
+To create a dashboard, you must have data indexed into {es}, an index pattern 
+to retrieve the data from {es}, and 
+visualizations, saved searches, or maps. If these don't exist, you're prompted to 
+add them as you create the dashboard.
+
+For an end-to-end example, see <<tutorial-build-dashboard, Building your own dashboard>>.
 
-. In the side navigation, click *Dashboard*.
+. Open *Dashboard.*
 . Click *Create new dashboard.*
 . Click *Add*.
-. [[adding-visualizations-to-a-dashboard]]Use *Add Panels* to add visualizations
-and saved searches to the dashboard. If you have a large number of
-visualizations, you can filter the lists.
+. Use *Add panels* to add elements to the dashboard.
++
+The visualizations, saved searches, and maps
+are stored in panels that you can move and resize. A
+menu in the upper right of the panel has options for customizing
+the panel. You can add elements from 
+multiple indices, and the same element can appear in multiple dashboards.
 +
 [role="screenshot"]
 image:images/Dashboard_add_visualization.png[Example add visualization to dashboard]
 
-. [[saving-dashboards]]When you're finished adding and arranging the panels,
-go to the menu bar and click *Save*.
-
-. In *Save Dashboard*, enter a dashboard title and optionally a description.
-
-. To store the time period specified in the time filter, enable *Store time
-with dashboard*.
-
-. Click *Save*.
-
-[[loading-a-saved-dashboard]]
-To import, export, and delete dashboards, see <<managing-saved-objects>>.
+. When you're finished adding and arranging the panels,
+*Save* the dashboard.
 
+[float]
 [[customizing-your-dashboard]]
-== Arranging Dashboard Elements
+=== Arrange dashboard elements
 
-The visualizations and searches in a dashboard are stored in panels that you can move,
-resize, edit, and delete.  To start editing, click *Edit* in the menu bar.
+In *Edit* mode, you can move, resize, customize, and delete panels to suit your needs. 
 
 [[moving-containers]]
 * To move a panel, click and hold the panel header and drag to the new location.
@@ -71,53 +89,60 @@ resize, edit, and delete.  To start editing, click *Edit* in the menu bar.
 * To resize a panel, click the resize control on the lower right and drag
 to the new dimensions.
 
-[[removing-containers]]
-Additional commands for managing the panel and its contents
-are in the gear menu in the upper right.
+* To toggle the use of margins and panel titles, use the *Options* menu in the upper left.
 
-[role="screenshot"]
-image:images/Dashboard_Resize_Menu.png[Example dashboard]
-
-NOTE: Deleting a panel from a
+* To delete a panel, open the panel menu and select *Delete from dashboard.* Deleting a panel from a
 dashboard does *not* delete the saved visualization or search.
 
-[[viewing-detailed-information]]
-== Inspecting a Visualization from the Dashboard
 
-Many visualizations allow you to inspect the data and requests behind the
-visualization.
+[float]
+[[sharing-dashboards]]
+=== Share a dashboard
+
+[[embedding-dashboards]]
+When you've finished your dashboard, you can share it with your teammates. 
+From the *Share* menu, you can:
+
+* Embed the code in a web page. Users must have Kibana access
+to view an embedded dashboard.
+* Share a direct link to a {kib} dashboard
+* Generate a PDF report
+* Generate a PNG report
+
+TIP: You can create a link to a dashboard by title by doing this: +
+`${domain}/${basepath?}/app/kibana#/dashboards?title=${yourdashboardtitle}`
+
+TIP: When sharing a link to a dashboard snapshot, use the *Short URL*. Snapshot
+URLs are long and can be problematic for Internet Explorer and other
+tools. To create a short URL, you must have write access to {kib}.
 
-In the dashboard, expand the visualization's panel menu (or gear menu if in
-*Edit* mode) and select *Inspect*.
+[float]
+[[import-dashboards]]
+=== Import and export dashboards
+
+To import and export dashboards, go to *Management > Saved Objects*. For details,
+see <<managing-saved-objects, Managing saved objects>>. 
 
-The initial view shows the underlying data for the visualization. To view the
-requests that were made for the visualization, choose *Requests* from the *View*
-menu.
+[float]
+[[viewing-detailed-information]]
+=== Inspect and edit elements
 
-The views you'll see depend on the element that you inspect.
+Many dashboard elements allow you to drill down into the data and requests 
+behind the element. Open the menu in the upper right of the panel and select *Inspect*. 
+The views you see depend on the element that you inspect. 
 
 [role="screenshot"]
-image:images/Dashboard_visualization_data.png[Example of visualization data]
+image:images/Dashboard_inspect.png[Inspect in dashboard]
 
+To open an element for editing, put the dashboard in *Edit* mode, 
+and then select *Edit* from the panel menu. The changes you make appear in
+every dashboard that uses the element. 
+
+include::management/dashboard_only_mode/index.asciidoc[]
 
 
-[[sharing-dashboards]]
-== Sharing a Dashboard
 
-You can either share a direct link to a Kibana dashboard,
-or embed the dashboard in a web page. Users must have Kibana access
-to view an embedded dashboard.
 
-[[embedding-dashboards]]
 
-. Open the dashboard you want to share.
-. In the menu bar, click *Share*.
-. Copy the link you want to share or the iframe you want to embed. You can
-share the live dashboard or a static snapshot of the current point in time.
 
-TIP: You can create a link to a dashboard by title by doing this: +
-`${domain}/${basepath?}/app/kibana#/dashboards?title=${yourdashboardtitle}`
 
-TIP: When sharing a link to a dashboard snapshot, use the *Short URL*. Snapshot
-URLs are long and can be problematic for Internet Explorer and other
-tools.  To create a short URL, you must have write access to {kib}.

docs/development/core/development-basepath.asciidoc

@@ -66,6 +66,15 @@ To accomplish this the `serve` task does a few things:
   - redirects from `/{any}/app/{appName}` to `/{randomBasePath}/app/{appName}` so that refreshes should work
   - proxies all requests starting with `/{randomBasePath}/` to the Kibana server
 
+If you're writing scripts that interact with the Kibana API, the base path proxy will likely
+make this difficult. To bypass the base path proxy for a single request, prefix urls with
+`__UNSAFE_bypassBasePath` and the request will be routed to the development Kibana server.
+
+["source","shell"]
+-----------
+curl "http://elastic:changeme@localhost:5601/__UNSAFE_bypassBasePath/api/status"
+-----------
+
 This proxy can sometimes have unintended side effects in development, so when
 needed you can opt out by passing the `--no-base-path` flag to the `serve` task
 or `yarn start`.

docs/development/core/public/kibana-plugin-public.contextsetup.md

@@ -95,8 +95,10 @@ export type VizRenderer = (context: VizRenderContext, domElement: HTMLElement) =
 class VizRenderingPlugin {
   private readonly vizRenderers = new Map<string, ((domElement: HTMLElement) => () => void)>();
 
+  constructor(private readonly initContext: PluginInitializerContext) {}
+
   setup(core) {
-    this.contextContainer = core.createContextContainer<
+    this.contextContainer = core.context.createContextContainer<
       VizRenderContext,
       ReturnType<VizRenderer>,
       [HTMLElement]
@@ -110,8 +112,8 @@ class VizRenderingPlugin {
   }
 
   start(core) {
-    // Register the core context available to all renderers. Use the VizRendererContext's pluginId as the first arg.
-    this.contextContainer.registerContext('viz_rendering', 'core', () => ({
+    // Register the core context available to all renderers. Use the VizRendererContext's opaqueId as the first arg.
+    this.contextContainer.registerContext(this.initContext.opaqueId, 'core', () => ({
       i18n: core.i18n,
       uiSettings: core.uiSettings
     }));

docs/development/core/public/kibana-plugin-public.corestart.md

@@ -23,5 +23,6 @@ export interface CoreStart
 |  [i18n](./kibana-plugin-public.corestart.i18n.md) | <code>I18nStart</code> | [I18nStart](./kibana-plugin-public.i18nstart.md) |
 |  [notifications](./kibana-plugin-public.corestart.notifications.md) | <code>NotificationsStart</code> | [NotificationsStart](./kibana-plugin-public.notificationsstart.md) |
 |  [overlays](./kibana-plugin-public.corestart.overlays.md) | <code>OverlayStart</code> | [OverlayStart](./kibana-plugin-public.overlaystart.md) |
+|  [savedObjects](./kibana-plugin-public.corestart.savedobjects.md) | <code>SavedObjectsStart</code> | [SavedObjectsStart](./kibana-plugin-public.savedobjectsstart.md) |
 |  [uiSettings](./kibana-plugin-public.corestart.uisettings.md) | <code>UiSettingsClientContract</code> | [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md) |
 

docs/development/core/public/kibana-plugin-public.corestart.savedobjects.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [CoreStart](./kibana-plugin-public.corestart.md) &gt; [savedObjects](./kibana-plugin-public.corestart.savedobjects.md)
+
+## CoreStart.savedObjects property
+
+[SavedObjectsStart](./kibana-plugin-public.savedobjectsstart.md)
+
+<b>Signature:</b>
+
+```typescript
+savedObjects: SavedObjectsStart;
+```