Merge branch 'master' of github.com:elastic/kibana into findreplace/P…

…roviderNames

.node-version

@@ -1 +1 @@
-4.3.0
+4.3.2

CONTRIBUTING.md

@@ -13,7 +13,7 @@ At any given time the Kibana team at Elastic is working on dozens of features an
 Let's just get this out there: **Feel free to +1 an issue**. That said, a +1 isn't a vote. We keep up on highly commented issues, but comments are but one of many reasons we might, or might not, work on an issue. A solid write up of your use case is more likely to make your case than a comment that says *+10000*.
 
 #### My issue isn't getting enough attention
-First of all, sorry about that, we want you to have a great time with Kibana! You should join us on IRC (#kibana on freenode) and chat about it. Github is terrible for conversations. With that out of the way, there are a number of variables that go into deciding what to work on. These include priority, impact, difficulty, applicability to use cases, and last, and importantly: What we feel like working on.
+First of all, sorry about that, we want you to have a great time with Kibana! You should join us on IRC ([#kibana](https://kiwiirc.com/client/irc.freenode.net/?#kibana) on freenode) and chat about it. Github is terrible for conversations. With that out of the way, there are a number of variables that go into deciding what to work on. These include priority, impact, difficulty, applicability to use cases, and last, and importantly: What we feel like working on.
 
 ### I want to help!
 **Now we're talking**. If you have a bugfix or new feature that you would like to contribute to Kibana, please **find or open an issue about it before you start working on it.** Talk about what you would like to do. It may be that somebody is already working on it, or that there are particular issues that you should know about before implementing the change.
@@ -111,94 +111,90 @@ Before running the tests you will need to install the projects dependencies as d
 
 Once that is complete just run:
 
-```sh
+```
+sh
 npm run test && npm run build
 ```
 
-#### Testing and debugging tests
+#### Debugging unit tests
 
 The standard `npm run test` task runs several sub tasks and can take several minutes to complete, making debugging failures pretty painful. In order to ease the pain specialized tasks provide alternate methods for running the tests.
 
-<dl>
-  <dt><code>npm run test:quick</code></dt>
-  <dd>Runs both server and browser tests, but skips linting</dd>
-
-  <dt><code>npm run test:server</code> or <code>npm run test:browser</code></dt>
-  <dd>Runs the tests for just the server or browser</dd>
 
-  <dt><code>npm run test:dev</code></dt>
-  <dd>
-    Initializes an environment for debugging the browser tests. Includes an dedicated instance of the kibana server for building the test bundle, and a karma server. When running this task the build is optimized for the first time and then a karma-owned instance of the browser is opened. Click the "debug" button to open a new tab that executes the unit tests.
-    <br>
-    <img src="http://i.imgur.com/DwHxgfq.png">
-  </dd>
+`npm run test:quick`  
+Runs both server and browser tests, but skips linting
 
-  <dt><code>npm run mocha [test file or dir]</code> or <code>npm run mocha:debug [test file or dir]</code></dt>
-  <dd>
-    Run a one off test with the local project version of mocha, babel compilation, and optional debugging. Great
-    for development and fixing individual tests.
-  </dd>
-</dl>
+`npm run test:server`  
+Run only the server tests
 
-Distributable packages can be found in `target/` after the build completes.
-
-#### Building OS packages
-
-Packages are built using fpm, pleaserun, dpkg, and rpm.  fpm and pleaserun can be installed using gem.  Package building has only been tested on Linux and is not supported on any other platform.
-```sh
-gem install pleaserun
-apt-get install ruby-dev
-gem install fpm
-npm run build:ospackages
-```
+`npm run test:browser`  
+Run only the browser tests
 
-To specify a package to build you can add `rpm` or `deb` as an argument.
-```sh
-npm run build:ospackages -- --rpm
-```
+`npm run test:dev`  
+Initializes an environment for debugging the browser tests. Includes an dedicated instance of the kibana server for building the test bundle, and a karma server. When running this task the build is optimized for the first time and then a karma-owned instance of the browser is opened. Click the "debug" button to open a new tab that executes the unit tests.  
+![Browser test debugging](http://i.imgur.com/DwHxgfq.png)
 
-### Functional UI Testing
+`npm run mocha [test file or dir]` or `npm run mocha:debug [test file or dir]`  
+Run a one off test with the local project version of mocha, babel compilation, and optional debugging. Great
+for development and fixing individual tests.
 
-#### Handy references
+#### Unit testing plugins
+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.
 
-- https://theintern.github.io/
-- https://theintern.github.io/leadfoot/Element.html
+`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.
 
-#### Running tests using npm task:
+#### Running browser automation tests:
 
 *The Selenium server that is started currently only runs the tests in Firefox*
 
-To run the functional UI tests use the following commands
-
-<dl>
-
-  <dt><code>npm run test:ui</code></dt>
-  <dd>Run the functional UI tests one time and exit. This is used by the CI systems and is great for quickly checking that things pass. It is essentially a combination of the next two tasks.</dd>
+The following will start Kibana, Elasticsearch and Selenium for you. To run the functional UI tests use the following commands
 
-  <dt><code>npm run test:ui:server</code></dt>
-  <dd>Start the server required for the <code>test:ui:runner</code> tasks. Once the server is started <code>test:ui:runner</code> can be run multiple times without waiting for the server to start.</dd>
+`npm run test:ui`  
+Run the functional UI tests one time and exit. This is used by the CI systems and is great for quickly checking that things pass. It is essentially a combination of the next two tasks.
 
-  <dt><code>npm run test:ui:runner</code></dt>
-  <dd>Execute the front-end selenium tests. This requires the server started by the <code>test:ui:server</code> task.</dd>
+`npm run test:ui:server`  
+Start the server required for the `test:ui:runner` tasks. Once the server is started `test:ui:runner` can be run multiple times without waiting for the server to start.
 
-</dl>
+`npm run test:ui:runner`  
+Execute the front-end selenium tests. This requires the server started by the `test:ui:server` task.
 
-#### Running tests locally with your existing (and already running) ElasticSearch, Kibana, and Selenium Server:
+##### If you already have ElasticSearch, Kibana, and Selenium Server running:
 
-Set your es and kibana ports in `test/intern.js` to 9220 and 5620, respecitively. You can configure your Selenium server to run the tests on Chrome,IE, or other browsers here.
+Set your es and kibana ports in `test/intern.js` to 9220 and 5620, respectively. You can configure your Selenium server to run the tests on Chrome,IE, or other browsers here.
 
 Once you've got the services running, execute the following:
 
-```sh
+```
+sh
 npm run test:ui:runner
 ```
 
-#### General notes:
+#### Browser automation notes:
 
 - Using Page Objects pattern (https://theintern.github.io/intern/#writing-functional-test)
-- At least the initial tests for the Settings, Discover, and Visualize tabs all depend on a very specific set of logstash-type data (generated with makelogs).  Since that is a static set of data, all the Discover and Visualize tests use a specific Absolute time range.  This gaurantees the same results each run.
+- At least the initial tests for the Settings, Discover, and Visualize tabs all depend on a very specific set of logstash-type data (generated with makelogs).  Since that is a static set of data, all the Discover and Visualize tests use a specific Absolute time range.  This guarantees the same results each run.
 - These tests have been developed and tested with Chrome and Firefox browser.  In theory, they should work on all browsers (that's the benefit of Intern using Leadfoot).
 - These tests should also work with an external testing service like https://saucelabs.com/ or https://www.browserstack.com/ but that has not been tested.
+- https://theintern.github.io/
+- https://theintern.github.io/leadfoot/Element.html
+
+#### Building OS packages
+
+Packages are built using fpm, pleaserun, dpkg, and rpm.  fpm and pleaserun can be installed using gem.  Package building has only been tested on Linux and is not supported on any other platform.
+```sh
+gem install pleaserun
+apt-get install ruby-dev
+gem install fpm
+npm run build:ospackages
+```
+
+To specify a package to build you can add `rpm` or `deb` as an argument.
+```sh
+npm run build:ospackages -- --rpm
+```
+
+Distributable packages can be found in `target/` after the build completes.
 
 ## Submitting a pull request
 
@@ -225,6 +221,7 @@ Remember, someone is blocked by a pull awaiting review, make it count. Be thorou
 1. **Understand the issue** that is being fixed, or the feature being added. Check the description on the pull, and check out the related issue. If you don't understand something, ask the person the submitter for clarification.
 1. **Reproduce the bug** (or the lack of feature I guess?) in the destination branch, usually `master`. The referenced issue will help you here. If you're unable to reproduce the issue, contact the issue submitter for clarification
 1. **Check out the pull** and test it. Is the issue fixed? Does it have nasty side effects? Try to create suspect inputs. If it operates on the value of a field try things like: strings (including an empty string), null, numbers, dates. Try to think of edge cases that might break the code.
+1. **Merge the target branch**. It is possible that tests or the linter have been updated in the target branch since the pull was submitted. Merging the pull could cause core to start failing.
 1. **Read the code**. Understanding the changes will help you find additional things to test. Contact the submitter if you don't understand something.
 1. **Go line-by-line**. Are there [style guide](https://github.com/elastic/kibana/blob/master/STYLEGUIDE.md) violations? Strangely named variables? Magic numbers? Do the abstractions make sense to you? Are things arranged in a testable way?
 1. **Speaking of tests** Are they there? If a new function was added does it have tests? Do the tests, well, TEST anything? Do they just run the function or do they properly check the output?

STYLEGUIDE.md

@@ -586,7 +586,7 @@ Use slashes for both single line and multi line comments. Try to write
 comments that explain higher level mechanisms or clarify difficult
 segments of your code. **Don't use comments to restate trivial things**.
 
-***Exception:*** Comment blocks describing a function and it's arguments (docblock) should start with `/**`, contain a single `*` at the begining of each line, and end with `*/`.
+***Exception:*** Comment blocks describing a function and its arguments (docblock) should start with `/**`, contain a single `*` at the beginning of each line, and end with `*/`.
 
 *Right:*
 
@@ -656,7 +656,7 @@ function ClassName() {
 var ClassName = function () {};
 ```
 
-### Inhertiance should be done with a utility
+### Inheritance should be done with a utility
 
 While you can do it with pure JS, a utility will remove a lot of boilerplate, and be more readable and functional.
 
@@ -685,7 +685,7 @@ Square.prototype = Object.create(Shape);
 
 ### Keep Constructors Small
 
-It is often the case that there are properties that can't be defined on the prototype, or work that needs to be done to completely create an object (like call it's Super class). This is all that should be done within constructors.
+It is often the case that there are properties that can't be defined on the prototype, or work that needs to be done to completely create an object (like call its Super class). This is all that should be done within constructors.
 
 Try to follow the [Write small functions](#write-small-functions) rule here too.
 
@@ -775,7 +775,7 @@ Several already exist, and can be found in `src/kibana/utils/_mixins.js`
 
 ## Filenames
 
-All filenames should use `snake_case` and *can* start with an underscore if the module is not intended to be used outside of it's containing module.
+All filenames should use `snake_case` and *can* start with an underscore if the module is not intended to be used outside of its containing module.
 
 *Right:*
   - `src/kibana/index_patterns/index_pattern.js`
@@ -858,7 +858,7 @@ app.service('CustomService', function(Promise, otherDeps) {
 
 ### Routes
 
-Angular routes are defined using a custom require modules named `routes` that remove much of the required boilerplate.
+Angular routes are defined using a custom require module named `routes` that remove much of the required boilerplate.
 
 ```js
 require('ui/routes')
@@ -871,7 +871,7 @@ require('ui/routes')
 
 ## Multiple attribute values
 
-When a node has multiple attributes that would cause it to exceed the line character limit, each attribute including the first should be on its own line with a single indent. Also, when a node that is styled in this way has child nodes, there should be a blank line between the openening parent tag and the first child tag.
+When a node has multiple attributes that would cause it to exceed the line character limit, each attribute including the first should be on its own line with a single indent. Also, when a node that is styled in this way has child nodes, there should be a blank line between the opening parent tag and the first child tag.
 
 ```
 <ul

config/kibana.yml

@@ -19,7 +19,7 @@
 # that connects to this Kibana instance.
 # elasticsearch.preserveHost: true
 
-# Kibana uses an index in Elasticsearch to store saved searches, visualizations and 
+# Kibana uses an index in Elasticsearch to store saved searches, visualizations and
 # dashboards. Kibana creates a new index if the index doesn’t already exist.
 # kibana.index: ".kibana"
 
@@ -28,12 +28,12 @@
 
 # If your Elasticsearch is protected with basic authentication, these settings provide
 # the username and password that the Kibana server uses to perform maintenance on the Kibana
-# index at startup. Your Kibana users still need to authenticate with Elasticsearch, which 
+# index at startup. Your Kibana users still need to authenticate with Elasticsearch, which
 # is proxied through the Kibana server.
 # elasticsearch.username: "user"
 # elasticsearch.password: "pass"
 
-# Paths to the PEM-format SSL certificate and SSL key files, respectively. These 
+# Paths to the PEM-format SSL certificate and SSL key files, respectively. These
 # files enable SSL for outgoing requests from the Kibana server to the browser.
 # server.ssl.cert: /path/to/your/server.crt
 # server.ssl.key: /path/to/your/server.key
@@ -43,7 +43,7 @@
 # elasticsearch.ssl.cert: /path/to/your/client.crt
 # elasticsearch.ssl.key: /path/to/your/client.key
 
-# Optional setting that enables you to specify a path to the PEM file for the certificate 
+# Optional setting that enables you to specify a path to the PEM file for the certificate
 # authority for your Elasticsearch instance.
 # elasticsearch.ssl.ca: /path/to/your/CA.pem
 
@@ -54,9 +54,9 @@
 # the elasticsearch.requestTimeout setting.
 # elasticsearch.pingTimeout: 1500
 
-# Time in milliseconds to wait for responses from the back end or Elasticsearch. This value 
+# Time in milliseconds to wait for responses from the back end or Elasticsearch. This value
 # must be a positive integer.
-# elasticsearch.requestTimeout: 300000
+# elasticsearch.requestTimeout: 30000
 
 # Time in milliseconds for Elasticsearch to wait for responses from shards. Set to 0 to disable.
 # elasticsearch.shardTimeout: 0
@@ -76,6 +76,10 @@
 # Set the value of this setting to true to suppress all logging output other than error messages.
 # logging.quiet: false
 
-# Set the value of this setting to true to log all events, including system usage information 
+# Set the value of this setting to true to log all events, including system usage information
 # and all requests.
 # logging.verbose: false
+
+# Set the interval in milliseconds to sample system and process performance
+# metrics. Minimum is 100ms. Defaults to 10000.
+# ops.interval: 10000

docs/kibana-repositories.asciidoc

@@ -22,11 +22,11 @@ has the following fingerprint:
 wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
 --------------------------------------------------
 +
-. Add the repository definition to your `/etc/apt/sources.list` file:
+. Add the repository definition to your `/etc/apt/sources.list.d/kibana.list` file:
 +
 [source, sh]
 --------------------------------------------------
-echo "deb http://packages.elastic.co/kibana/{branch}/debian stable main" | sudo tee -a /etc/apt/sources.list
+echo "deb http://packages.elastic.co/kibana/{branch}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
 --------------------------------------------------
 +
 [WARNING]
@@ -37,7 +37,7 @@ When the `deb-src` entry, is present, the commands in this procedure generate an
 
     Unable to find expected entry 'main/source/Sources' in Release file (Wrong sources.list entry or malformed file)
 
-Delete the `deb-src` entry from the `/etc/apt/sources.list` file to clear the error.
+Delete the `deb-src` entry from the `/etc/apt/sources.list.d/kibana.list` file to clear the error.
 ==================================================
 +
 . Run `apt-get update` and the repository is ready for use. Install Kibana with the following command:

docs/kibana-yml.asciidoc

@@ -39,3 +39,4 @@ retrying.
 error messages.
 `logging.verbose`:: *Default: false* Set the value of this setting to `true` to log all events, including system usage 
 information and all requests.
+`ops.interval`:: *Default: 10000* Set the interval in milliseconds to sample system and process performance metrics. Minimum is 100ms. Defaults to 10 seconds.

package.json

@@ -56,6 +56,7 @@
     "elasticsearchWithPlugins": "grunt esvm:withPlugins:keepalive",
     "lint": "grunt eslint:source",
     "lintroller": "grunt eslint:fixSource",
+    "makelogs": "makelogs",
     "mocha": "mocha",
     "mocha:debug": "mocha --debug-brk",
     "sterilize": "grunt sterilize"
@@ -88,7 +89,7 @@
     "boom": "2.8.0",
     "bootstrap": "3.3.5",
     "brace": "0.5.1",
-    "bunyan": "1.4.0",
+    "bunyan": "1.7.1",
     "clipboard": "1.5.5",
     "commander": "2.8.1",
     "css-loader": "0.17.0",
@@ -127,11 +128,10 @@
     "moment-timezone": "0.4.1",
     "raw-loader": "0.5.1",
     "request": "2.61.0",
-    "requirefrom": "0.2.0",
     "rimraf": "2.4.3",
     "rjs-repack-loader": "1.0.6",
     "script-loader": "0.6.1",
-    "semver": "4.3.6",
+    "semver": "5.1.0",
     "style-loader": "0.12.3",
     "tar": "2.2.0",
     "url-loader": "0.5.6",
@@ -146,7 +146,7 @@
     "angular-mocks": "1.4.7",
     "auto-release-sinon": "1.0.3",
     "babel-eslint": "4.1.8",
-    "chokidar": "1.0.5",
+    "chokidar": "1.4.3",
     "eslint": "1.10.3",
     "eslint-plugin-mocha": "1.1.0",
     "expect.js": "0.3.1",
@@ -177,6 +177,7 @@
     "libesvm": "3.3.0",
     "license-checker": "3.1.0",
     "load-grunt-config": "0.7.2",
+    "makelogs": "3.0.0-beta3",
     "marked-text-renderer": "0.1.0",
     "mocha": "2.3.0",
     "nock": "2.10.0",
@@ -188,7 +189,7 @@
     "supertest-as-promised": "2.0.2"
   },
   "engines": {
-    "node": "4.3.0",
-    "npm": "2.14.15"
+    "node": "4.3.2",
+    "npm": "2.14.22"
   }
 }

src/cli/cli.js

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 
-let utils = require('requirefrom')('src/utils');
-let pkg = utils('packageJson');
+import pkg from '../utils/packageJson';
 import Command from './Command';
 
 let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();