-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Kibana settings api * Use different version of this utility * Adding settings api test * Fix these tests * Update test
- Loading branch information
1 parent
5be6038
commit cf03af7
Showing
5 changed files
with
106 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
x-pack/plugins/xpack_main/server/routes/api/v1/settings.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { wrap as wrapError } from 'boom'; | ||
import { KIBANA_SETTINGS_TYPE } from '../../../../../monitoring/common/constants'; | ||
import { getKibanaInfoForStats } from '../../../../../monitoring/server/kibana_monitoring/lib'; | ||
|
||
const getClusterUuid = async callCluster => { | ||
const { cluster_uuid: uuid } = await callCluster('info', { filterPath: 'cluster_uuid', }); | ||
return uuid; | ||
}; | ||
|
||
export function settingsRoute(server, kbnServer) { | ||
server.route({ | ||
path: '/api/settings', | ||
method: 'GET', | ||
async handler(req, reply) { | ||
const { server } = req; | ||
const { callWithRequest } = server.plugins.elasticsearch.getCluster('data'); | ||
const callCluster = (...args) => callWithRequest(req, ...args); // All queries from HTTP API must use authentication headers from the request | ||
|
||
try { | ||
const { collectorSet } = server.usage; | ||
const settingsCollector = collectorSet.getCollectorByType(KIBANA_SETTINGS_TYPE); | ||
|
||
const settings = await settingsCollector.fetch(callCluster); | ||
const uuid = await getClusterUuid(callCluster); | ||
|
||
const kibana = getKibanaInfoForStats(server, kbnServer); | ||
reply({ | ||
cluster_uuid: uuid, | ||
settings: { | ||
...settings, | ||
kibana, | ||
} | ||
}); | ||
} catch(err) { | ||
req.log(['error'], err); // FIXME doesn't seem to log anything useful if ES times out | ||
if (err.isBoom) { | ||
reply(err); | ||
} else { | ||
reply(wrapError(err, err.statusCode, err.message)); | ||
} | ||
} | ||
} | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
x-pack/test/api_integration/apis/xpack_main/settings/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
export default function ({ loadTestFile }) { | ||
describe('Settings', () => { | ||
loadTestFile(require.resolve('./settings')); | ||
}); | ||
} |
42 changes: 42 additions & 0 deletions
42
x-pack/test/api_integration/apis/xpack_main/settings/settings.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import expect from 'expect.js'; | ||
|
||
export default function ({ getService }) { | ||
const supertest = getService('supertest'); | ||
const esArchiver = getService('esArchiver'); | ||
|
||
describe('/api/settings', () => { | ||
describe('with trial license clusters', () => { | ||
const archive = 'monitoring/multicluster'; | ||
|
||
before('load clusters archive', () => { | ||
return esArchiver.load(archive); | ||
}); | ||
|
||
after('unload clusters archive', () => { | ||
return esArchiver.unload(archive); | ||
}); | ||
|
||
it('should load multiple clusters', async () => { | ||
const { body } = await supertest | ||
.get('/api/settings') | ||
.set('kbn-xsrf', 'xxx') | ||
.expect(200); | ||
expect(body.cluster_uuid.length > 1).to.eql(true); | ||
expect(body.settings.kibana.uuid.length > 0).to.eql(true); | ||
expect(body.settings.kibana.name.length > 0).to.eql(true); | ||
expect(body.settings.kibana.index.length > 0).to.eql(true); | ||
expect(body.settings.kibana.host.length > 0).to.eql(true); | ||
expect(body.settings.kibana.transport_address.length > 0).to.eql(true); | ||
expect(body.settings.kibana.version.length > 0).to.eql(true); | ||
expect(body.settings.kibana.status.length > 0).to.eql(true); | ||
}); | ||
}); | ||
}); | ||
} | ||
|