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

Merge pull request #13564 from grafana/13562-stackdriver-undefined-name

Browse Source 
stackdriver metric name fix. Fixes #13562
This commit is contained in:
Daniel Lee 2018-10-08 16:31:29 +02:00 committed by GitHub
commit 562f62a763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,7 +241,17 @@ export default class StackdriverDatasource {
try { try {
const metricsApiPath = `v3/projects/${projectId}/metricDescriptors`; const metricsApiPath = `v3/projects/${projectId}/metricDescriptors`;
const { data } = await this.doRequest(`${this.baseUrl}${metricsApiPath}`); const { data } = await this.doRequest(`${this.baseUrl}${metricsApiPath}`);
return data.metricDescriptors;
const metrics = data.metricDescriptors.map(m => {
const [service] = m.type.split('/');
const [serviceShortName] = service.split('.');
m.service = service;
m.serviceShortName = serviceShortName;
m.displayName = m.displayName || m.type;
return m;
});
return metrics;
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }

12
public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
View File

@ -96,11 +96,9 @@ export class StackdriverFilterCtrl {
getServicesList() { getServicesList() {
const defaultValue = { value: this.$scope.defaultServiceValue, text: this.$scope.defaultServiceValue }; const defaultValue = { value: this.$scope.defaultServiceValue, text: this.$scope.defaultServiceValue };
const services = this.metricDescriptors.map(m => { const services = this.metricDescriptors.map(m => {
const [service] = m.type.split('/');
const [serviceShortName] = service.split('.');
return { return {
value: service, value: m.service,
text: serviceShortName, text: m.serviceShortName,
}; };
}); });
@ -113,12 +111,10 @@ export class StackdriverFilterCtrl {
getMetricsList() { getMetricsList() {
const metrics = this.metricDescriptors.map(m => { const metrics = this.metricDescriptors.map(m => {
const [service] = m.type.split('/');
const [serviceShortName] = service.split('.');
return { return {
service, service: m.service,
value: m.type, value: m.type,
serviceShortName, serviceShortName: m.serviceShortName,
text: m.displayName, text: m.displayName,
title: m.description, title: m.description,
}; };

13
public/app/plugins/datasource/stackdriver/specs/datasource.test.ts
View File

@ -164,11 +164,11 @@ describe('StackdriverDataSource', () => {
metricDescriptors: [ metricDescriptors: [
{ {
displayName: 'test metric name 1', displayName: 'test metric name 1',
type: 'test metric type 1', type: 'compute.googleapis.com/instance/cpu/test-metric-type-1',
description: 'A description',
}, },
{ {
displayName: 'test metric name 2', type: 'logging.googleapis.com/user/logbased-metric-with-no-display-name',
type: 'test metric type 2',
}, },
], ],
}, },
@ -180,8 +180,13 @@ describe('StackdriverDataSource', () => {
}); });
it('should return successfully', () => { it('should return successfully', () => {
expect(result.length).toBe(2); expect(result.length).toBe(2);
expect(result[0].type).toBe('test metric type 1'); expect(result[0].service).toBe('compute.googleapis.com');
expect(result[0].serviceShortName).toBe('compute');
expect(result[0].type).toBe('compute.googleapis.com/instance/cpu/test-metric-type-1');
expect(result[0].displayName).toBe('test metric name 1'); expect(result[0].displayName).toBe('test metric name 1');
expect(result[0].description).toBe('A description');
expect(result[1].type).toBe('logging.googleapis.com/user/logbased-metric-with-no-display-name');
expect(result[1].displayName).toBe('logging.googleapis.com/user/logbased-metric-with-no-display-name');
}); });
}); });