Merge branch 'master' into feature/dev-tools

.eslintignore

@@ -1,4 +1,4 @@
-src/fixtures
+
 test/fixtures/scenarios
 optimize
 test/fixtures/scenarios

.gitignore

@@ -19,7 +19,8 @@ target
 /esvm
 .htpasswd
 .eslintcache
-installedPlugins
+plugins
+data
 disabledPlugins
 webpackstats.json
 config/kibana.dev.yml

CONTRIBUTING.md

@@ -142,7 +142,7 @@ for development and fixing individual tests.
 This should work super if you're using the [Kibana plugin generator](https://github.com/elastic/generator-kibana-plugin). If you're not using the generator, well, you're on your own. We suggest you look at how the generator works.
 
 `npm run test:dev -- --kbnServer.testsBundle.pluginId=some_special_plugin --kbnServer.plugin-path=../some_special_plugin`
-Run the tests for just your particular plugin. Assuming you plugin lives outside of the `installedPlugins directory`, which it should.
+Run the tests for just your particular plugin. Assuming you plugin lives outside of the `plugins directory`, which it should.
 
 #### Running browser automation tests:
 

Gruntfile.js

@@ -10,7 +10,7 @@ module.exports = function (grunt) {
     root: __dirname,
     src: __dirname + '/src',
     buildDir: __dirname + '/build', // temporary build directory
-    plugins: __dirname + '/src/plugins',
+    plugins: __dirname + '/src/core_plugins',
     server: __dirname + '/src/server',
     target: __dirname + '/target', // location of the compressed build targets
     testUtilsDir: __dirname + '/src/test_utils',
@@ -24,10 +24,8 @@ module.exports = function (grunt) {
       switch (require('os').platform()) {
         case 'win32':
           return 'IE';
-        case 'darwin':
-          return 'Chrome';
         default:
-          return 'Firefox';
+          return 'Chrome';
       }
     }()),
 
@@ -46,6 +44,7 @@ module.exports = function (grunt) {
       '<%= root %>/tasks/**/*.js',
       '<%= root %>/test/**/*.js',
       '<%= src %>/**/*.js',
+      '!<%= src %>/ui/public/angular-bootstrap/**/*.js',
       '!<%= src %>/fixtures/**/*.js',
       '!<%= root %>/test/fixtures/scenarios/**/*.js'
     ],

README.md

@@ -1,4 +1,4 @@
-# Kibana 5.0.0-alpha4
+# Kibana 5.0.0-alpha5
 
 Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/blob/master/LICENSE.md)), browser based analytics and search dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana strives to be easy to get started with, while also being flexible and powerful, just like Elasticsearch.
 
@@ -43,7 +43,7 @@ For the daring, snapshot builds are available. These builds are created after ea
 
 | platform |  |
 | --- | --- |
-| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-darwin-x64.tar.gz) |
-| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-x86_64.rpm) |
-| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-i686.rpm) |
-| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha4-SNAPSHOT-windows.zip) |
+| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-darwin-x64.tar.gz) |
+| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-x86_64.rpm) |
+| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-i686.rpm) |
+| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha5-SNAPSHOT-windows.zip) |

docs/advanced-settings.asciidoc

@@ -14,9 +14,9 @@ compatible with other configuration settings. Deleting a custom setting removes
 `dateFormat:dow`:: This property defines what day weeks should start on.
 adapt to the interval between measurements. Keys are http://en.wikipedia.org/wiki/ISO_8601#Time_intervals[ISO8601 intervals].
 `defaultIndex`:: Default is `null`. This property specifies the default index.
+`defaultColumns`:: Default is `_source`. Defines the columns that appear by default on the Discover page.
 `metaFields`:: An array of fields outside of `_source`. Kibana merges these fields into the document when displaying the
 document.
-`defaultColumns`:: Default is `_source`. Defines the columns that appear by default on the Discover page.
 `discover:sampleSize`:: The number of rows to show in the Discover table.
 `doc_table:highlight`:: Highlight results in Discover and Saved Searches Dashboard. Highlighing makes request slow when
 working on big documents. Set this property to `false` to disable highlighting.
@@ -52,3 +52,10 @@ mentioned use "_default_".
 `timepicker:timeDefaults`:: The default time filter selection.
 `timepicker:refreshIntervalDefaults`:: The time filter's default refresh interval.
 `dashboard:defaultDarkTheme`:: Set this property to `true` to make new dashboards use the dark theme by default.
+`filters:pinnedByDefault`:: Set this property to `true` to make filters have a global state by default.
+`notifications:banner`:: You can specify a custom banner to display temporary notices to all users. This field supports 
+Markdown.
+`notifications:lifetime:banner`:: Specifies the duration in milliseconds for banner notification displays. The default value is 3000000. Set this field to `Infinity` to disable banner notifications.
+`notifications:lifetime:error`:: Specifies the duration in milliseconds for error notification displays. The default value is 300000. Set this field to `Infinity` to disable error notifications.
+`notifications:lifetime:warning`:: Specifies the duration in milliseconds for warning notification displays. The default value is 10000. Set this field to `Infinity` to disable warning notifications.
+`notifications:lifetime:info`:: Specifies the duration in milliseconds for information notification displays. The default value is 5000. Set this field to `Infinity` to disable information notifications.

docs/area.asciidoc

@@ -67,7 +67,6 @@ values.
 *Scale Y-Axis to Data Bounds*:: The default Y axis bounds are zero and the maximum value returned in the data. Check 
 this box to change both upper and lower bounds to match the values returned in the data.
 *Show Tooltip*:: Check this box to enable the display of tooltips.
-*Show Legend*:: Check this box to enable the display of a legend next to the chart.
 
 [float]
 [[area-viewing-detailed-information]]

docs/getting-started.asciidoc

@@ -27,15 +27,14 @@ The tutorials in this section rely on the following data sets:
 
 * The complete works of William Shakespeare, suitably parsed into fields. Download this data set by clicking here: 
   https://www.elastic.co/guide/en/kibana/3.0/snippets/shakespeare.json[shakespeare.json].
-* A set of fictitious accounts with randomly generated data. Download this data set by clicking here: 
-  https://github.com/bly2k/files/blob/master/accounts.zip?raw=true[accounts.zip]
+* A set of fictitious accounts with randomly generated data, in CSV format. Download this data set by clicking here: 
+  https://www.github.com/elastic/kibana/docs/tutorial/accounts.csv[accounts.csv]
 * A set of randomly generated log files. Download this data set by clicking here: 
   https://download.elastic.co/demos/kibana/gettingstarted/logs.jsonl.gz[logs.jsonl.gz]
 
-Two of the data sets are compressed. Use the following commands to extract the files:
+Extract the logs with the following command:
 
 [source,shell]
-unzip accounts.zip
 gunzip logs.jsonl.gz
 
 The Shakespeare data set is organized in the following schema:
@@ -82,6 +81,8 @@ field's searchability or whether or not it's _tokenized_, or broken up into sepa
 
 Use the following command to set up a mapping for the Shakespeare data set:
 
+=============
+
 [source,shell]
 curl -XPUT http://localhost:9200/shakespeare -d '
 {
@@ -98,6 +99,8 @@ curl -XPUT http://localhost:9200/shakespeare -d '
 }
 ';
 
+=============
+
 This mapping specifies the following qualities for the data set:
 
 * The _speaker_ field is a string that isn't analyzed. The string in this field is treated as a single unit, even if
@@ -167,16 +170,29 @@ curl -XPUT http://localhost:9200/logstash-2015.05.20 -d '
 }
 ';
 
-The accounts data set doesn't require any mappings, so at this point we're ready to use the Elasticsearch 
-{ref}/docs-bulk.html[`bulk`] API to load the data sets with the following commands:
+At this point we're ready to use the Elasticsearch {ref}/docs-bulk.html[`bulk`] API to load the data sets with the 
+following commands:
 
 [source,shell]
-curl -XPOST 'localhost:9200/bank/account/_bulk?pretty' --data-binary @accounts.json
 curl -XPOST 'localhost:9200/shakespeare/_bulk?pretty' --data-binary @shakespeare.json
 curl -XPOST 'localhost:9200/_bulk?pretty' --data-binary @logs.jsonl
 
 These commands may take some time to execute, depending on the computing resources available.
 
+To load the Accounts data set, click the *Management* image:images/SettingsButton.jpg[gear icon] tab, the 
+select *Upload CSV*.
+
+image::images/management-panel.png[kibana management panel]
+
+Click *Select File*, then navigate to the `accounts.csv` file. Review the sample, then click *Next*.
+
+image::images/csv-sample.png[sample csv import]
+
+Review the index pattern built by the CSV import function. You can change any field types from the drop-downs, but for 
+this tutorial, accept the defaults. Enter `bank` as the name for the index pattern, then click *Save*.
+
+image::images/sample-index.png[sample index pattern]
+
 Verify successful loading with the following command:
 
 [source,shell]

docs/line.asciidoc

@@ -46,7 +46,6 @@ affect the representation of your data and create a potential for ambiguity.
 *Set Y-Axis Extents*:: Check this box and enter values in the *y-max* and *y-min* fields to set the Y axis to specific 
 values. 
 *Show Tooltip*:: Check this box to enable the display of tooltips.
-*Show Legend*:: Check this box to enable the display of a legend next to the chart.
 *Scale Y-Axis to Data Bounds*:: The default Y-axis bounds are zero and the maximum value returned in the data. Check 
 this box to change both upper and lower bounds to match the values returned in the data.
 

docs/pie.asciidoc

@@ -80,7 +80,6 @@ Select the *Options* tab to change the following aspects of the table:
 
 *Donut*:: Display the chart as a sliced ring instead of a sliced pie.
 *Show Tooltip*:: Check this box to enable the display of tooltips.
-*Show Legend*:: Check this box to enable the display of a legend next to the chart.
 
 After changing options, click the *Apply changes* button to update your visualization, or the grey *Discard 
 changes* button to keep your visualization in its current state.

docs/plugins.asciidoc

@@ -1,9 +1,9 @@
 [[kibana-plugins]]
 == Kibana Plugins
 
-Add-on functionality for Kibana is implemented with plug-in modules. You can use the `bin/kibana-plugin` 
-command to manage these modules. You can also install a plugin manually by moving the plugin file to the 
-`installedPlugins` directory and unpacking the plugin files into a new directory.
+Add-on functionality for Kibana is implemented with plug-in modules. You can use the `bin/kibana-plugin`
+command to manage these modules. You can also install a plugin manually by moving the plugin file to the
+`plugins` directory and unpacking the plugin files into a new directory.
 
 A list of existing Kibana plugins is available on https://github.com/elastic/kibana/wiki/Known-Plugins[GitHub].
 
@@ -38,7 +38,7 @@ You can specify URLs that use the HTTP, HTTPS, or `file` protocols.
 [float]
 === Installing Plugins to an Arbitrary Directory
 
-Use the `-d` or `--plugin-dir` option after the `install` command to specify a directory for plugins, as in the following 
+Use the `-d` or `--plugin-dir` option after the `install` command to specify a directory for plugins, as in the following
 example:
 
 [source,shell]
@@ -63,7 +63,7 @@ Use the `remove` command to remove a plugin, including any configuration informa
 [source,shell]
 $ bin/kibana-plugin remove timelion
 
-You can also remove a plugin manually by deleting the plugin's subdirectory under the `installedPlugins/` directory.
+You can also remove a plugin manually by deleting the plugin's subdirectory under the `plugins/` directory.
 
 [float]
 === Listing Installed Plugins
@@ -78,28 +78,28 @@ To update a plugin, remove the current version and reinstall the plugin.
 [float]
 === Configuring the Plugin Manager
 
-By default, the plugin manager provides you with feedback on the status of the activity you've asked the plugin manager 
-to perform. You can control the level of feedback for the `install` and `remove` commands with the `--quiet` and 
-`--silent` options. Use the `--quiet` option to suppress all non-error output. Use the `--silent` option to suppress all 
+By default, the plugin manager provides you with feedback on the status of the activity you've asked the plugin manager
+to perform. You can control the level of feedback for the `install` and `remove` commands with the `--quiet` and
+`--silent` options. Use the `--quiet` option to suppress all non-error output. Use the `--silent` option to suppress all
 output.
 
 By default, plugin manager installation requests do not time out. Use the `--timeout` option, followed by a time, to
 change this behavior, as in the following examples:
 
 [source,shell]
 .Waits for 30 seconds before failing
-bin/kibana-plugin install --timeout 30s sample-plugin 
+bin/kibana-plugin install --timeout 30s sample-plugin
 
 [source,shell]
 .Waits for 1 minute before failing
-bin/kibana-plugin install --timeout 1m sample-plugin 
+bin/kibana-plugin install --timeout 1m sample-plugin
 
 [float]
 ==== Plugins and Custom Kibana Configurations
 
-Use the `-c` or `--config` options with the `install` and `remove` commands to specify the path to the configuration file 
-used to start Kibana. By default, Kibana uses the configuration file `config/kibana.yml`. When you change your installed 
-plugins, the `bin/kibana-plugin` command restarts the Kibana server. When you are using a customized configuration file, 
+Use the `-c` or `--config` options with the `install` and `remove` commands to specify the path to the configuration file
+used to start Kibana. By default, Kibana uses the configuration file `config/kibana.yml`. When you change your installed
+plugins, the `bin/kibana-plugin` command restarts the Kibana server. When you are using a customized configuration file,
 you must specify the path to that configuration file each time you use the `bin/kibana-plugin` command.
 
 [float]
@@ -115,7 +115,7 @@ you must specify the path to that configuration file each time you use the `bin/
 [[plugin-switcher]]
 == Switching Plugin Functionality
 
-The Kibana UI serves as a framework that can contain several different plugins. You can switch between these 
+The Kibana UI serves as a framework that can contain several different plugins. You can switch between these
 plugins by clicking the icons for your desired plugins in the left-hand navigation bar.
 
 [float]
@@ -126,4 +126,4 @@ Use the following command to disable a plugin:
 [source,shell]
 ./bin/kibana --<plugin ID>.enabled=false
 
-You can find a plugin's plugin ID as the value of the `name` property in the plugin's `package.json` file.
+You can find a plugin's plugin ID as the value of the `name` property in the plugin's `package.json` file.