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: Use metric type from query controller state

Browse Source
This commit is contained in:
Erik Sundell
2018-09-10 19:09:43 +02:00
committed by Daniel Lee
parent 191b6cc32c
commit 2d52e5d26c
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,13 +13,12 @@ export default class StackdriverDatasource {
async query(options) {
const queries = options.targets.filter(target => !target.hide).map(t => ({
queryType: 'raw',
refId: t.refId,
datasourceId: this.id,
metric: t.metricType,
metricType: `metric.type="${t.metricType}"`,
}));
try {
const response = await this.backendSrv.datasourceRequest({
const { data } = await this.backendSrv.datasourceRequest({
url: '/api/tsdb/query',
method: 'POST',
data: {
@@ -28,7 +27,18 @@ export default class StackdriverDatasource {
queries,
},
});
return response;
const result = [];
if (data.results) {
Object['values'](data.results).forEach(queryRes => {
queryRes.series.forEach(series => {
result.push({ target: series.name, datapoints: series.points });
});
});
}
return { data: result };
} catch (error) {
console.log(error);
}
@@ -77,7 +87,7 @@ export default class StackdriverDatasource {
try {
const metricsApiPath = `v3/projects/${projectId}/metricDescriptors`;
const { data } = await this.doRequest(`${this.baseUrl}${metricsApiPath}`);
return data.metricDescriptors.map(m => ({ id: m.name, name: m.displayName }));
return data.metricDescriptors.map(m => ({ id: m.type, name: m.displayName }));
} catch (error) {
console.log(error);
}