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

Merge pull request #5729 from spalger/pr/5670

Browse source 
Resubmission of #5670
This commit is contained in:
Rashid Khan 2015-12-21 16:44:10 -07:00
parent de6e3adf69 5bad265168
commit 245ae24c4c
4 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js
View file

@ -60,7 +60,7 @@ describe('plugins/elasticsearch', function () {
});
});
it('should be created with 1 shard and 1 replica', function () {
it('should be created with 1 shard and default replica', function () {
var fn = createKibanaIndex(server);
return fn.then(function () {
var params = client.indices.create.args[0][0];
@ -71,22 +71,7 @@ describe('plugins/elasticsearch', function () {
expect(params.body.settings)
.to.have.property('number_of_shards', 1);
expect(params.body.settings)
.to.have.property('number_of_replicas', 1);
});
});
it('should be created with 1 shard and 1 replica', function () {
var fn = createKibanaIndex(server);
return fn.then(function () {
var params = client.indices.create.args[0][0];
expect(params)
.to.have.property('body');
expect(params.body)
.to.have.property('settings');
expect(params.body.settings)
.to.have.property('number_of_shards', 1);
expect(params.body.settings)
.to.have.property('number_of_replicas', 1);
.to.not.have.property('number_of_replicas');
});
});
@ -137,4 +122,3 @@ describe('plugins/elasticsearch', function () {
});
});

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

@ -76,7 +76,7 @@ describe('plugins/elasticsearch', function () {
testRoute({
method: 'POST',
url: '/elasticsearch/.kibana',
payload: {settings: { number_of_shards: 1, number_of_replicas: 1 }},
payload: {settings: { number_of_shards: 1 }},
statusCode: 200
});

3
src/plugins/elasticsearch/lib/create_kibana_index.js
View file

@ -14,8 +14,7 @@ module.exports = function (server) {
index: index,
body: {
settings: {
number_of_shards: 1,
number_of_replicas: 1
number_of_shards: 1
},
mappings: {
config: {

3
test/fixtures/scenarios/emptyKibana/kibanaDefinition.js vendored
View file

@ -1,7 +1,6 @@
module.exports = {
settings: {
number_of_shards: 1,
number_of_replicas: 1
number_of_shards: 1
},
mappings: {
config: {