root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 90 Packages Projects Releases Wiki Activity

stackdriver: better error handling for getLabels

This commit is contained in:
Daniel Lee 2018-09-24 15:40:10 +02:00
parent c9ee05422f
commit fbc1af6cd5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/stackdriver/query_ctrl.ts
View File

@ -136,7 +136,8 @@ export class StackdriverQueryCtrl extends QueryCtrl {
this.resourceLabels = data.results[this.target.refId].meta.resourceLabels;
resolve();
} catch (error) {
appEvents.emit('ds-request-error', 'Error loading metric labels for ' + this.target.metricType);
console.log(error.data.message);
appEvents.emit('alert-error', ['Error', 'Error loading metric labels for ' + this.target.metricType]);
resolve();
}
});
@ -149,7 +150,8 @@ export class StackdriverQueryCtrl extends QueryCtrl {
async getGroupBys(segment, index, removeText?: string, removeUsed = true) {
await this.loadLabelsPromise;
const metricLabels = Object.keys(this.metricLabels)
const metricLabels = Object.keys(this.metricLabels || {})
.filter(ml => {
if (!removeUsed) {
return true;
@ -163,7 +165,7 @@ export class StackdriverQueryCtrl extends QueryCtrl {
});
});
const resourceLabels = Object.keys(this.resourceLabels)
const resourceLabels = Object.keys(this.resourceLabels || {})
.filter(ml => {
if (!removeUsed) {
return true;