maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into testVisualize

Browse source
This commit is contained in:
LeeDr 2015-12-04 14:47:30 -06:00
commit e200cd16a8
8 changed files with 65 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/plugins/elasticsearch/lib/__tests__/check_es_version.js
View file

@ -22,7 +22,8 @@ describe('plugins/elasticsearch', function () {
},
status: {
red: sinon.stub()
}
},
url: 'http://localhost:9210'
}
}
};

10
src/plugins/elasticsearch/lib/__tests__/health_check.js
View file

@ -39,7 +39,7 @@ describe('plugins/elasticsearch', function () {
nodes: {
'node-01': {
version: '1.5.0',
http_address: 'inet[/127.0.0.1:9200]',
http_address: 'inet[/127.0.0.1:9210]',
ip: '127.0.0.1'
}
}
@ -73,7 +73,7 @@ describe('plugins/elasticsearch', function () {
it('should set the cluster red if the ping fails, then to green', function () {
get.withArgs('elasticsearch.url').returns('http://localhost:9200');
get.withArgs('elasticsearch.url').returns('http://localhost:9210');
get.withArgs('elasticsearch.minimumVersion').returns('1.4.4');
get.withArgs('kibana.index').returns('.my-kibana');
client.ping.onCall(0).returns(Promise.reject(new NoConnections()));
@ -85,7 +85,7 @@ describe('plugins/elasticsearch', function () {
expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
sinon.assert.calledOnce(plugin.status.red);
expect(plugin.status.red.args[0][0]).to.be(
'Unable to connect to Elasticsearch at http://localhost:9200. Retrying in 2.5 seconds.'
'Unable to connect to Elasticsearch at http://localhost:9210. Retrying in 2.5 seconds.'
);
sinon.assert.calledTwice(client.ping);
sinon.assert.calledOnce(client.nodes.info);
@ -97,7 +97,7 @@ describe('plugins/elasticsearch', function () {
});
it('should set the cluster red if the health check status is red, then to green', function () {
get.withArgs('elasticsearch.url').returns('http://localhost:9200');
get.withArgs('elasticsearch.url').returns('http://localhost:9210');
get.withArgs('elasticsearch.minimumVersion').returns('1.4.4');
get.withArgs('kibana.index').returns('.my-kibana');
client.ping.returns(Promise.resolve());
@ -120,7 +120,7 @@ describe('plugins/elasticsearch', function () {
});
it('should set the cluster yellow if the health check timed_out and create index', function () {
get.withArgs('elasticsearch.url').returns('http://localhost:9200');
get.withArgs('elasticsearch.url').returns('http://localhost:9210');
get.withArgs('elasticsearch.minimumVersion').returns('1.4.4');
get.withArgs('kibana.index').returns('.my-kibana');
client.ping.returns(Promise.resolve());

3
src/plugins/elasticsearch/lib/__tests__/routes.js
View file

@ -27,6 +27,9 @@ describe('plugins/elasticsearch', function () {
},
optimize: {
enabled: false
},
elasticsearch: {
url: 'http://localhost:9210'
}
});

5
src/plugins/elasticsearch/lib/__tests__/validate.js
View file

@ -17,7 +17,10 @@ describe('plugins/elasticsearch', function () {
server: { autoListen: false },
plugins: { scanDirs: [ fromRoot('src/plugins') ] },
logging: { quiet: true },
optimize: { enabled: false }
optimize: { enabled: false },
elasticsearch: {
url: 'http://localhost:9210'
}
});
return kbnServer.ready()

3
src/server/__tests__/basePath.js
View file

@ -18,6 +18,9 @@ describe('Server basePath config', function () {
plugins: { scanDirs: [src('plugins')] },
logging: { quiet: true },
optimize: { enabled: false },
elasticsearch: {
url: 'http://localhost:9210'
}
});
await kbnServer.ready();
return kbnServer;

3
src/server/http/__tests__/xsrf.js
View file

@ -23,6 +23,9 @@ describe('xsrf request filter', function () {
plugins: { scanDirs: [src('plugins')] },
logging: { quiet: true },
optimize: { enabled: false },
elasticsearch: {
url: 'http://localhost:9210'
}
});
await kbnServer.ready();

31
src/server/http/index.js
View file

@ -26,7 +26,36 @@ module.exports = function (kbnServer, server, config) {
if (config.get('server.ssl.key') && config.get('server.ssl.cert')) {
connectionOptions.tls = {
key: fs.readFileSync(config.get('server.ssl.key')),
cert: fs.readFileSync(config.get('server.ssl.cert'))
cert: fs.readFileSync(config.get('server.ssl.cert')),
// The default ciphers in node 0.12.x include insecure ciphers, so until
// we enforce a more recent version of node, we craft our own list
// @see https://github.com/nodejs/node/blob/master/src/node_constants.h#L8-L28
ciphers: [
'ECDHE-RSA-AES128-GCM-SHA256',
'ECDHE-ECDSA-AES128-GCM-SHA256',
'ECDHE-RSA-AES256-GCM-SHA384',
'ECDHE-ECDSA-AES256-GCM-SHA384',
'DHE-RSA-AES128-GCM-SHA256',
'ECDHE-RSA-AES128-SHA256',
'DHE-RSA-AES128-SHA256',
'ECDHE-RSA-AES256-SHA384',
'DHE-RSA-AES256-SHA384',
'ECDHE-RSA-AES256-SHA256',
'DHE-RSA-AES256-SHA256',
'HIGH',
'!aNULL',
'!eNULL',
'!EXPORT',
'!DES',
'!RC4',
'!MD5',
'!PSK',
'!SRP',
'!CAMELLIA'
].join(':'),
// We use the server's cipher order rather than the client's to prevent
// the BEAST attack
honorCipherOrder: true
};
}

16
tasks/config/esvm.js
View file

@ -28,6 +28,9 @@ module.exports = function (grunt) {
config: {
path: {
data: dataDir
},
cluster: {
name: 'esvm-dev'
}
}
}
@ -35,7 +38,15 @@ module.exports = function (grunt) {
test: {
options: {
directory: resolve(directory, 'test'),
purge: true
purge: true,
config: {
http: {
port: 9210
},
cluster: {
name: 'esvm-test'
}
}
}
},
ui: {
@ -45,6 +56,9 @@ module.exports = function (grunt) {
config: {
http: {
port: uiConfig.servers.elasticsearch.port
},
cluster: {
name: 'esvm-ui'
}
}
}