IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: improve query editor to handle no data better

Browse Source
This commit is contained in:
Daniel Lee 2018-09-14 19:28:48 +02:00
parent 12da19695f
commit 0b41303e10
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,23 +12,27 @@ export default class StackdriverDatasource {
} }
async getTimeSeries(options) { async getTimeSeries(options) {
const queries = options.targets.filter(target => !target.hide).map(t => { const queries = options.targets
if (!t.hasOwnProperty('aggregation')) { .filter(target => {
t.aggregation = { return !target.hide && target.metricType;
crossSeriesReducer: 'REDUCE_MEAN', })
groupBys: [], .map(t => {
if (!t.hasOwnProperty('aggregation')) {
t.aggregation = {
crossSeriesReducer: 'REDUCE_MEAN',
groupBys: [],
};
}
return {
refId: t.refId,
datasourceId: this.id,
metricType: t.metricType,
primaryAggregation: t.aggregation.crossSeriesReducer,
groupBys: t.aggregation.groupBys,
view: t.view || 'FULL',
filters: t.filters,
}; };
} });
return {
refId: t.refId,
datasourceId: this.id,
metricType: t.metricType,
primaryAggregation: t.aggregation.crossSeriesReducer,
groupBys: t.aggregation.groupBys,
view: t.view || 'FULL',
filters: t.filters,
};
});
const { data } = await this.backendSrv.datasourceRequest({ const { data } = await this.backendSrv.datasourceRequest({
url: '/api/tsdb/query', url: '/api/tsdb/query',

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

@ -84,7 +84,10 @@ export class StackdriverQueryCtrl extends QueryCtrl {
this.getCurrentProject() this.getCurrentProject()
.then(this.getMetricTypes.bind(this)) .then(this.getMetricTypes.bind(this))
.then(this.getLabels.bind(this)) .then(this.getLabels.bind(this))
.then(resolve); .then(resolve)
.catch(err => {
console.log(err);
});
}); });
this.initSegments(); this.initSegments();
@ -149,7 +152,7 @@ export class StackdriverQueryCtrl extends QueryCtrl {
if (this.target.project.id !== 'default') { if (this.target.project.id !== 'default') {
const metricTypes = await this.datasource.getMetricTypes(this.target.project.id); const metricTypes = await this.datasource.getMetricTypes(this.target.project.id);
if (this.target.metricType === this.defaultDropdownValue && metricTypes.length > 0) { if (this.target.metricType === this.defaultDropdownValue && metricTypes.length > 0) {
this.$scope.$apply(() => (this.target.metricType = metricTypes[0].name)); this.$scope.$apply(() => (this.target.metricType = metricTypes[0].id));
} }
return metricTypes.map(mt => ({ value: mt.id, text: mt.id })); return metricTypes.map(mt => ({ value: mt.id, text: mt.id }));
} else { } else {
@ -183,7 +186,9 @@ export class StackdriverQueryCtrl extends QueryCtrl {
} }
async getGroupBys(segment, index, removeText?: string, removeUsed = true) { async getGroupBys(segment, index, removeText?: string, removeUsed = true) {
await this.initPromise; if (!this.metricLabels || Object.keys(this.metricLabels).length === 0) {
await this.initPromise;
}
const metricLabels = Object.keys(this.metricLabels) const metricLabels = Object.keys(this.metricLabels)
.filter(ml => { .filter(ml => {
if (!removeUsed) { if (!removeUsed) {
@ -213,6 +218,11 @@ export class StackdriverQueryCtrl extends QueryCtrl {
}); });
}); });
const noValueOrPlusButton = !segment || segment.type === 'plus-button';
if (noValueOrPlusButton && metricLabels.length === 0 && resourceLabels.length === 0) {
return Promise.resolve([]);
}
this.removeSegment.value = removeText || this.defaultRemoveGroupByValue; this.removeSegment.value = removeText || this.defaultRemoveGroupByValue;
return Promise.resolve([...metricLabels, ...resourceLabels, this.removeSegment]); return Promise.resolve([...metricLabels, ...resourceLabels, this.removeSegment]);
} }