IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-27 11:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: improve error handling in the datasource

Browse Source
This commit is contained in:
Erik Sundell 2018-10-11 09:51:44 +02:00
parent afe0b4b8db
commit a56c5841e9
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
public/app/plugins/datasource/stackdriver/datasource.ts
View File

@ -198,25 +198,29 @@ export default class StackdriverDatasource {
title: 'Success',
};
} catch (error) {
let message = 'Stackdriver: ';
message += error.statusText ? error.statusText + ': ' : '';
if (error.data && error.data.error) {
try {
const res = JSON.parse(error.data.error);
message += res.error.code + '. ' + res.error.message;
} catch (err) {
message += error.data.error;
}
} else {
message += 'Cannot connect to Stackdriver API';
}
return {
status: 'error',
message: message,
message: this.formatStackdriverError(error),
};
}
}
formatStackdriverError(error) {
let message = 'Stackdriver: ';
message += error.statusText ? error.statusText + ': ' : '';
if (error.data && error.data.error) {
try {
const res = JSON.parse(error.data.error);
message += res.error.code + '. ' + res.error.message;
} catch (err) {
message += error.data.error;
}
} else {
message += 'Cannot connect to Stackdriver API';
}
return message;
}
async getDefaultProject() {
try {
if (!this.projectName) {
@ -239,21 +243,7 @@ export default class StackdriverDatasource {
return this.projectName;
}
} catch (error) {
let message = 'Projects cannot be fetched: ';
message += error.statusText ? error.statusText + ': ' : '';
if (error && error.data && error.data.error && error.data.error.message) {
if (error.data.error.code === 403) {
message += `
A list of projects could not be fetched from the Google Cloud Resource Manager API.
You might need to enable it first:
https://console.developers.google.com/apis/library/cloudresourcemanager.googleapis.com`;
} else {
message += error.data.error.code + '. ' + error.data.error.message;
}
} else {
message += 'Cannot connect to Stackdriver API';
}
appEvents.emit('ds-request-error', message);
appEvents.emit('ds-request-error', this.formatStackdriverError(error));
return '';
}
}
@ -274,7 +264,8 @@ export default class StackdriverDatasource {
return metrics;
} catch (error) {
console.log(error);
appEvents.emit('ds-request-error', this.formatStackdriverError(error));
return [];
}
}