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

Merge branch 'implement/defaultInjectedVars'

Browse source
This commit is contained in:
spalger 2015-11-04 13:13:13 -06:00
commit c9d06d521d
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,10 +38,7 @@ module.exports = function (kibana) {
let config = server.config();
return {
kbnIndex: config.get('kibana.index'),
kbnDefaultAppId: config.get('kibana.defaultAppId'),
esShardTimeout: config.get('elasticsearch.shardTimeout'),
esApiVersion: config.get('elasticsearch.apiVersion'),
kbnDefaultAppId: config.get('kibana.defaultAppId')
};
}
}

13
src/ui/index.js
View file

@ -1,5 +1,5 @@
module.exports = async (kbnServer, server, config) => {
let _ = require('lodash');
let { defaults } = require('lodash');
let Boom = require('boom');
let formatUrl = require('url').format;
let { resolve } = require('path');
@ -56,6 +56,15 @@ module.exports = async (kbnServer, server, config) => {
}
});
const defaultInjectedVars = {};
if (config.has('kibana')) {
defaultInjectedVars.kbnIndex = config.get('kibana.index');
}
if (config.has('elasticsearch')) {
defaultInjectedVars.esShardTimeout = config.get('elasticsearch.shardTimeout');
defaultInjectedVars.esApiVersion = config.get('elasticsearch.apiVersion');
}
server.decorate('reply', 'renderApp', function (app) {
let payload = {
app: app,
@ -63,7 +72,7 @@ module.exports = async (kbnServer, server, config) => {
version: kbnServer.version,
buildNum: config.get('pkg.buildNum'),
buildSha: config.get('pkg.buildSha'),
vars: app.getInjectedVars()
vars: defaults(app.getInjectedVars(), defaultInjectedVars),
};
return this.view(app.templateName, {