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

change serverConfig servers path

Browse source
This commit is contained in:
Joe Fleming 2015-11-04 16:08:00 -07:00
parent ef29fcc41f
commit 9592c4d273
6 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tasks/config/esvm.js
View file

@ -44,7 +44,7 @@ module.exports = function (grunt) {
purge: true,
config: {
http: {
port: uiConfig.elasticsearch.port
port: uiConfig.servers.elasticsearch.port
}
}
}

8
tasks/config/run.js
View file

@ -33,8 +33,8 @@ module.exports = function (grunt) {
},
cmd: /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana',
args: [
'--server.port=' + uiConfig.kibana.port,
'--elasticsearch.url=' + format(uiConfig.elasticsearch),
'--server.port=' + uiConfig.servers.kibana.port,
'--elasticsearch.url=' + format(uiConfig.servers.elasticsearch),
'--logging.json=false'
]
},
@ -89,7 +89,7 @@ module.exports = function (grunt) {
'-jar',
'selenium/selenium-server-standalone-2.47.1.jar',
'-port',
uiConfig.webdriver.port
uiConfig.servers.webdriver.port
]
},
@ -105,7 +105,7 @@ module.exports = function (grunt) {
'-jar',
'selenium/selenium-server-standalone-2.47.1.jar',
'-port',
uiConfig.webdriver.port
uiConfig.servers.webdriver.port
]
},

4
test/functional/apps/settings/index.js
View file

@ -21,7 +21,7 @@ define(function (require) {
function checkForSettingsUrl() {
return common.tryForTime(25000, function () {
return remote.get(url.format(_.assign(config.kibana, {
return remote.get(url.format(_.assign(config.servers.kibana, {
pathname: ''
})))
.then(function () {
@ -41,7 +41,7 @@ define(function (require) {
// that we will use for all the tests
bdd.before(function () {
common = new Common(this.remote);
scenarioManager = new ScenarioManager(url.format(config.elasticsearch));
scenarioManager = new ScenarioManager(url.format(config.servers.elasticsearch));
remote = this.remote;
return scenarioManager.loadIfEmpty('makelogs');

2
test/functional/status_page/index.js
View file

@ -14,7 +14,7 @@ define(function (require) {
bdd.beforeEach(function () {
// load the status page
return this.remote.get(getUrl(config.kibana, 'status'));
return this.remote.get(getUrl(config.servers.kibana, 'status'));
});
bdd.it('should show the kibana plugin as ready', function () {

2
test/intern.js
View file

@ -11,7 +11,7 @@ define(function (require) {
environments: [{
browserName: 'firefox'
}],
tunnelOptions: serverConfig.webdriver,
tunnelOptions: serverConfig.servers.webdriver,
functionalSuites: [
'test/functional/status_page/index',
'test/functional/apps/settings/index'

30
test/serverConfig.js
View file

@ -1,17 +1,19 @@
module.exports = {
webdriver: {
protocol: process.env.TEST_UI_WEBDRIVER_PROTOCOL || 'http',
hostname: process.env.TEST_UI_WEBDRIVER_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_UI_WEBDRIVER_PORT, 10) || 4444
},
kibana: {
protocol: process.env.TEST_UI_KIBANA_PROTOCOL || 'http',
hostname: process.env.TEST_UI_KIBANA_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_UI_KIBANA_PORT, 10) || 5620
},
elasticsearch: {
protocol: process.env.TEST_UI_ES_PROTOCOL || 'http',
hostname: process.env.TEST_UI_ES_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_UI_ES_PORT, 10) || 9220
servers: {
webdriver: {
protocol: process.env.TEST_UI_WEBDRIVER_PROTOCOL || 'http',
hostname: process.env.TEST_UI_WEBDRIVER_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_UI_WEBDRIVER_PORT, 10) || 4444
},
kibana: {
protocol: process.env.TEST_UI_KIBANA_PROTOCOL || 'http',
hostname: process.env.TEST_UI_KIBANA_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_UI_KIBANA_PORT, 10) || 5620
},
elasticsearch: {
protocol: process.env.TEST_UI_ES_PROTOCOL || 'http',
hostname: process.env.TEST_UI_ES_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_UI_ES_PORT, 10) || 9220
}
}
};