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

Annotations: Fixes this.templateSrv.replace is not a function error for Grafana datasource (#21778)

Browse Source
This commit is contained in:
Hugo Häggmark 2020-01-28 09:41:19 +01:00 committed by GitHub
parent be09722d84
commit 2acfbdb768
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/plugins/datasource/grafana/datasource.ts
View File

@ -1,10 +1,14 @@
import _ from 'lodash';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { getBackendSrv } from '@grafana/runtime';
import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/data';
class GrafanaDatasource {
import templateSrv from 'app/features/templating/template_srv';
class GrafanaDatasource extends DataSourceApi<any> {
/** @ngInject */
constructor(private templateSrv: TemplateSrv) {}
constructor(instanceSettings: DataSourceInstanceSettings) {
super(instanceSettings);
}
query(options: any) {
return getBackendSrv()
@ -33,7 +37,7 @@ class GrafanaDatasource {
}
metricFindQuery(options: any) {
return Promise.resolve({ data: [] });
return Promise.resolve([]);
}
annotationQuery(options: any) {
@ -62,7 +66,7 @@ class GrafanaDatasource {
const delimiter = '__delimiter__';
const tags = [];
for (const t of params.tags) {
const renderedValues = this.templateSrv.replace(t, {}, (value: any) => {
const renderedValues = templateSrv.replace(t, {}, (value: any) => {
if (typeof value === 'string') {
return value;
}
@ -78,6 +82,10 @@ class GrafanaDatasource {
return getBackendSrv().get('/api/annotations', params);
}
testDatasource() {
return Promise.resolve();
}
}
export { GrafanaDatasource };

17
public/app/plugins/datasource/grafana/specs/datasource.test.ts
View File

@ -1,4 +1,4 @@
import { dateTime } from '@grafana/data';
import { DataSourceInstanceSettings, dateTime } from '@grafana/data';
import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
import { GrafanaDatasource } from '../datasource';
@ -7,6 +7,12 @@ jest.mock('@grafana/runtime', () => ({
getBackendSrv: () => backendSrv,
}));
jest.mock('app/features/templating/template_srv', () => ({
replace: (val: string) => {
return val.replace('$var2', 'replaced__delimiter__replaced2').replace('$var', 'replaced');
},
}));
describe('grafana data source', () => {
const getMock = jest.spyOn(backendSrv, 'get');
@ -16,7 +22,6 @@ describe('grafana data source', () => {
describe('when executing an annotations query', () => {
let calledBackendSrvParams: any;
let templateSrvStub: any;
let ds: GrafanaDatasource;
beforeEach(() => {
getMock.mockImplementation((url: string, options: any) => {
@ -24,13 +29,7 @@ describe('grafana data source', () => {
return Promise.resolve([]);
});
templateSrvStub = {
replace: (val: string) => {
return val.replace('$var2', 'replaced__delimiter__replaced2').replace('$var', 'replaced');
},
};
ds = new GrafanaDatasource(templateSrvStub as any);
ds = new GrafanaDatasource({} as DataSourceInstanceSettings);
});
describe('with tags that have template variables', () => {