github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Telemetry] Error handling: local stats collection/permissions bug fix (#26560) (#26567)

Browse source 
* monitoring collection bug fix

* show error for dev
This commit is contained in:
Tim Sullivan 2018-12-03 17:03:18 -07:00 • committed by GitHub
parent 8f48e81ec7
commit 7ca581c4a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
x-pack/plugins/xpack_main/server/routes/api/v1/telemetry/telemetry.js
View file

@ -21,7 +21,12 @@ export async function getTelemetry(req, config, start, end, { _getAllStats = get
let response = [];
if (config.get('xpack.monitoring.enabled')) {
response = await _getAllStats(req, start, end);
try {
// attempt to collect stats from multiple clusters in monitoring data
response = await _getAllStats(req, start, end);
} catch (err) {
// no-op
}
}
if (!Array.isArray(response) || response.length === 0) {
@ -92,7 +97,7 @@ export function telemetryRoute(server) {
} catch (err) {
if (config.get('env.dev')) {
// don't ignore errors when running in dev mode
return boomify(err);
return boomify(err, { statusCode: err.status });
} else {
// ignore errors, return empty set and a 200
return h.response([]).code(200);