github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[esclient] pass apiVersion from server to browser

Browse source
This commit is contained in:
spalger 2015-08-31 18:48:37 -07:00
parent c71afc1d0f
commit ef9770c503
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/elasticsearch/index.js
View file

@ -23,7 +23,7 @@ module.exports = function (kibana) {
cert: Joi.string(),
key: Joi.string()
}).default(),
apiVersion: Joi.string().default('master'),
apiVersion: Joi.string().default('2.0'),
minimumVerison: Joi.string().default('2.0.0')
}).default();
},

3
src/plugins/kibana/index.js
View file

@ -39,7 +39,8 @@ module.exports = function (kibana) {
return {
kbnIndex: config.get('kibana.index'),
esShardTimeout: config.get('elasticsearch.shardTimeout')
esShardTimeout: config.get('elasticsearch.shardTimeout'),
esApiVersion: config.get('elasticsearch.apiVersion'),
};
}
}

4
src/ui/public/es.js
View file

@ -5,14 +5,14 @@ define(function (require) {
var es; // share the client amoungst all apps
require('ui/modules')
.get('kibana', ['elasticsearch', 'kibana/config'])
.service('es', function (esFactory, esUrl, $q) {
.service('es', function (esFactory, esUrl, $q, esApiVersion) {
if (es) return es;
es = esFactory({
host: esUrl,
log: 'info',
requestTimeout: 0,
apiVersion: '1.4',
apiVersion: esApiVersion,
plugins: [function (Client, config) {
// esFactory automatically injects the AngularConnector to the config