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

[6.8] [Monitoring] Fix 500 error from /api/stats (#36986) (#37087)

Browse source 
* Backport #36986 to 6.8

* Undo changes that aren't supposed to be here
This commit is contained in:
Chris Roberson 2019-05-24 10:59:38 -04:00 • committed by GitHub
parent 5f790a10dc
commit 866ad9bdfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server/status/routes/api/register_stats.js
View file

@ -70,14 +70,13 @@ export function registerStatsApi(kbnServer, server, config) {
const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('admin');
const callCluster = (...args) => callWithRequest(req, ...args);
const usagePromise = shouldGetUsage ? getUsage(callCluster) : Promise.resolve();
const usagePromise = shouldGetUsage ? getUsage(callCluster) : Promise.resolve({});
try {
const [ usage, clusterUuid ] = await Promise.all([
usagePromise,
getClusterUuid(callCluster),
]);
let modifiedUsage = usage;
if (isLegacy) {
// In an effort to make telemetry more easily augmented, we need to ensure

16
test/api_integration/apis/stats/stats.js
View file

@ -120,13 +120,25 @@ export default function ({ getService }) {
});
describe('exclude usage', () => {
it('should exclude usage from the API response', () => {
it('should include an empty usage object from the API response', () => {
return supertest
.get('/api/stats?extended&exclude_usage')
.expect('Content-Type', /json/)
.expect(200)
.then(({ body }) => {
expect(body).to.not.have.property('usage');
expect(body).to.have.property('usage');
expect(body.usage).to.eql({});
});
});
it('should include an empty usage object from the API response if `legacy` is provided', () => {
return supertest
.get('/api/stats?extended&exclude_usage&legacy')
.expect('Content-Type', /json/)
.expect(200)
.then(({ body }) => {
expect(body).to.have.property('usage');
expect(body.usage).to.eql({});
});
});
});