diff --git a/docs/kibana-repositories.asciidoc b/docs/kibana-repositories.asciidoc index ff67335323bf..62768e04eace 100644 --- a/docs/kibana-repositories.asciidoc +++ b/docs/kibana-repositories.asciidoc @@ -1,12 +1,12 @@ [[setup-repositories]] === Kibana Repositories -Binary packages for Kibana are available for Unix distributions that support the `apt` and `yum` tools.We also have -repositories available for APT and YUM based distributions. +Binary packages for Kibana are available for Unix distributions that support the `apt` and `yum` tools.We also have +repositories available for APT and YUM based distributions. NOTE: Since the packages are created as part of the Kibana build, source packages are not available. -Packages are signed with the PGP key http://pgp.mit.edu/pks/lookup?op=vindex&search=0xD27D666CD88E42B4[D88E42B4], which +Packages are signed with the PGP key http://pgp.mit.edu/pks/lookup?op=vindex&search=0xD27D666CD88E42B4[D88E42B4], which has the following fingerprint: 4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4 @@ -31,7 +31,7 @@ echo "deb http://packages.elastic.co/kibana/{branch}/debian stable main" | sudo + [WARNING] ================================================== -Use the `echo` method described above to add the Kibana repository. Do not use `add-apt-repository`, as that command +Use the `echo` method described above to add the Kibana repository. Do not use `add-apt-repository`, as that command adds a `deb-src` entry with no corresponding source package. When the `deb-src` entry, is present, the commands in this procedure generate an error similar to the following: @@ -47,7 +47,7 @@ Delete the `deb-src` entry from the `/etc/apt/sources.list` file to clear the er sudo apt-get update && sudo apt-get install kibana -------------------------------------------------- + -. Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init`, +. Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init`, run the following command: + [source,sh] @@ -67,7 +67,7 @@ sudo /bin/systemctl enable kibana.service [[kibana-yum]] ===== Installing Kibana with yum -WARNING: The repositories set up in this procedure are not compatible with distributions using version 3 of `rpm`, such +WARNING: The repositories set up in this procedure are not compatible with distributions using version 3 of `rpm`, such as CentOS version 5. . Download and install the public signing key: @@ -96,8 +96,8 @@ enabled=1 yum install kibana -------------------------------------------------- + -Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init`, -run the following command: +Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init` +(check with `ps -p 1`), run the following command: + [source,sh] -------------------------------------------------- diff --git a/package.json b/package.json index 067eaea06baa..acba26563bc9 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "elasticsearchWithPlugins": "grunt esvm:withPlugins:keepalive", "lint": "grunt eslint:source", "lintroller": "grunt eslint:fixSource", - "mocha": "mocha --compilers js:babel/register", - "mocha:debug": "mocha --debug-brk --compilers js:babel/register" + "mocha": "mocha", + "mocha:debug": "mocha --debug-brk" }, "repository": { "type": "git", @@ -142,7 +142,7 @@ "Nonsense": "0.1.2", "angular-mocks": "1.4.7", "auto-release-sinon": "1.0.3", - "babel-eslint": "4.1.3", + "babel-eslint": "4.1.7", "chokidar": "1.0.5", "eslint": "1.5.1", "eslint-plugin-mocha": "1.0.0", diff --git a/src/plugins/elasticsearch/lib/call_with_request.js b/src/plugins/elasticsearch/lib/call_with_request.js index 1bd818296c73..cf440b260219 100644 --- a/src/plugins/elasticsearch/lib/call_with_request.js +++ b/src/plugins/elasticsearch/lib/call_with_request.js @@ -2,15 +2,21 @@ const _ = require('lodash'); const Promise = require('bluebird'); const Boom = require('boom'); const getBasicAuthRealm = require('./get_basic_auth_realm'); +const toPath = require('lodash/internal/toPath'); module.exports = (client) => { return (req, endpoint, params = {}) => { if (req.headers.authorization) { _.set(params, 'headers.authorization', req.headers.authorization); } - const api = _.get(client, endpoint); + const path = toPath(endpoint); + const api = _.get(client, path); + let apiContext = _.get(client, path.slice(0, -1)); + if (_.isEmpty(apiContext)) { + apiContext = client; + } if (!api) throw new Error(`callWithRequest called with an invalid endpoint: ${endpoint}`); - return api.call(client, params) + return api.call(apiContext, params) .catch((err) => { if (err.status === 401) { // TODO: The err.message is temporary until we have support for getting headers in the client. diff --git a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js index 1f9bf7b62235..2411e915e149 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js @@ -60,11 +60,11 @@ define(function (require) { }; $scope.toggleDisplay = function (field) { - // inheritted param to fieldChooser + // This is inherited from fieldChooser $scope.toggle(field.name); if (field.display) $scope.increaseFieldCounter(field); - // we are now displaying the field, kill it's details + // we are now displaying the field, kill its details if (field.details) { $scope.toggleDetails(field); } diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html index 1bd6edaac644..4b57f3304114 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html +++ b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html @@ -16,7 +16,7 @@
@@ -65,7 +65,7 @@
- + {{conf.value || conf.defVal}} {{(conf.value || conf.defVal).join(', ')}} {{conf.value === undefined ? conf.defVal : conf.value}} @@ -74,7 +74,7 @@