Skip to content

N
nexpie-grafana-theme
Commit 31ad86ff by Hugo Häggmark Committed by GitHub
Options

TemplateSrv: deprecates templateSrv.variables and adds getVariables (#23026) 

* TemplateSrv: deprecates templateSrv.variables and adds getVariables

* Update public/app/plugins/datasource/postgres/query_ctrl.ts

Co-Authored-By: Dominik Prokop <dominik.prokop@grafana.com>

* Update public/app/plugins/datasource/stackdriver/components/VariableQueryEditor.test.tsx

Co-Authored-By: Dominik Prokop <dominik.prokop@grafana.com>

* Update public/app/plugins/datasource/cloudwatch/datasource.ts

Co-Authored-By: Dominik Prokop <dominik.prokop@grafana.com>

* Update public/app/plugins/datasource/mysql/query_ctrl.ts

Co-Authored-By: Dominik Prokop <dominik.prokop@grafana.com>

* Chore: updates after PR comments

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
parent 441e87d4
Showing with 80 additions and 55 deletions
public/app/core/services/segment_srv.ts
...@@ -95,7 +95,7 @@ export function uiSegmentSrv(this: any, $sce: any, templateSrv: any) { ...@@ -95,7 +95,7 @@ export function uiSegmentSrv(this: any, $sce: any, templateSrv: any) {
}); });
if (addTemplateVars) { if (addTemplateVars) {
_.each(templateSrv.variables, variable => { _.each(templateSrv.getVariables(), variable => {
if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) { if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) {
segments.unshift(self.newSegment({ type: 'value', value: '$' + variable.name, expandable: true })); segments.unshift(self.newSegment({ type: 'value', value: '$' + variable.name, expandable: true }));
} }
......
public/app/features/panel/panellinks/link_srv.ts
...@@ -8,16 +8,16 @@ import { getConfig } from 'app/core/config'; ...@@ -8,16 +8,16 @@ import { getConfig } from 'app/core/config';
import locationUtil from 'app/core/utils/location_util'; import locationUtil from 'app/core/utils/location_util';
import { DataLinkBuiltInVars } from '@grafana/ui'; import { DataLinkBuiltInVars } from '@grafana/ui';
import { import {
DataFrame,
DataLink, DataLink,
KeyValue,
deprecationWarning, deprecationWarning,
Field,
FieldType,
KeyValue,
LinkModel, LinkModel,
DataFrame,
ScopedVars, ScopedVars,
FieldType,
Field,
VariableSuggestion,
VariableOrigin, VariableOrigin,
VariableSuggestion,
VariableSuggestionsScope, VariableSuggestionsScope,
} from '@grafana/data'; } from '@grafana/data';
...@@ -77,7 +77,7 @@ const buildLabelPath = (label: string) => { ...@@ -77,7 +77,7 @@ const buildLabelPath = (label: string) => {
}; };
export const getPanelLinksVariableSuggestions = (): VariableSuggestion[] => [ export const getPanelLinksVariableSuggestions = (): VariableSuggestion[] => [
...templateSrv.variables.map(variable => ({ ...templateSrv.getVariables().map(variable => ({
value: variable.name as string, value: variable.name as string,
label: variable.name, label: variable.name,
origin: VariableOrigin.Template, origin: VariableOrigin.Template,
......
public/app/features/plugins/datasource_srv.ts
// Libraries // Libraries
import sortBy from 'lodash/sortBy'; import sortBy from 'lodash/sortBy';
import coreModule from 'app/core/core_module'; import coreModule from 'app/core/core_module';
// Services & Utils // Services & Utils
import config from 'app/core/config'; import config from 'app/core/config';
import { importDataSourcePlugin } from './plugin_loader'; import { importDataSourcePlugin } from './plugin_loader';
import { DataSourceSrv as DataSourceService, getDataSourceSrv as getDataSourceService } from '@grafana/runtime'; import { DataSourceSrv as DataSourceService, getDataSourceSrv as getDataSourceService } from '@grafana/runtime';
// Types // Types
import { DataSourceApi, DataSourceSelectItem, ScopedVars, AppEvents } from '@grafana/data'; import { AppEvents, DataSourceApi, DataSourceSelectItem, ScopedVars } from '@grafana/data';
import { auto } from 'angular'; import { auto } from 'angular';
import { TemplateSrv } from '../templating/template_srv'; import { TemplateSrv } from '../templating/template_srv';
import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
// Pretend Datasource // Pretend Datasource
import { expressionDatasource } from 'app/features/expressions/ExpressionDatasource'; import { expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
import { DataSourceVariableModel } from '../templating/types';
export class DatasourceSrv implements DataSourceService { export class DatasourceSrv implements DataSourceService {
datasources: Record<string, DataSourceApi> = {}; datasources: Record<string, DataSourceApi> = {};
...@@ -163,11 +161,13 @@ export class DatasourceSrv implements DataSourceService { ...@@ -163,11 +161,13 @@ export class DatasourceSrv implements DataSourceService {
addDataSourceVariables(list: any[]) { addDataSourceVariables(list: any[]) {
// look for data source variables // look for data source variables
this.templateSrv.variables this.templateSrv
.getVariables()
.filter(variable => variable.type === 'datasource') .filter(variable => variable.type === 'datasource')
.forEach(variable => { .forEach((variable: DataSourceVariableModel) => {
const first = variable.current.value === 'default' ? config.defaultDatasource : variable.current.value; const first = variable.current.value === 'default' ? config.defaultDatasource : variable.current.value;
const ds = config.datasources[first]; const index = (first as unknown) as string;
const ds = config.datasources[index];
if (ds) { if (ds) {
const key = `$${variable.name}`; const key = `$${variable.name}`;
......
public/app/features/plugins/specs/datasource_srv.test.ts
import config from 'app/core/config'; import config from 'app/core/config';
import 'app/features/plugins/datasource_srv'; import 'app/features/plugins/datasource_srv';
import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
import { PluginMeta, DataSourcePluginMeta } from '@grafana/data'; import { DataSourcePluginMeta, PluginMeta } from '@grafana/data';
// Datasource variable $datasource with current value 'BBB' // Datasource variable $datasource with current value 'BBB'
const templateSrv: any = { const templateSrv: any = {
variables: [ getVariables: () => [
{ {
type: 'datasource', type: 'datasource',
name: 'datasource', name: 'datasource',
......
public/app/features/templating/template_srv.ts
import kbn from 'app/core/utils/kbn'; import kbn from 'app/core/utils/kbn';
import _ from 'lodash'; import _ from 'lodash';
import { escapeHtml } from 'app/core/utils/text'; import { escapeHtml } from 'app/core/utils/text';
import { ScopedVars, TimeRange } from '@grafana/data'; import { deprecationWarning, ScopedVars, TimeRange } from '@grafana/data';
import { getVariableWithName, getFilteredVariables } from '../variables/state/selectors'; import { getFilteredVariables, getVariableClones, getVariableWithName } from '../variables/state/selectors';
import { getConfig } from 'app/core/config'; import { getConfig } from 'app/core/config';
import { variableRegex } from './utils'; import { variableRegex } from './utils';
import { isAdHoc } from '../variables/guard'; import { isAdHoc } from '../variables/guard';
import { VariableModel } from './types';
function luceneEscape(value: string) { function luceneEscape(value: string) {
return value.replace(/([\!\*\+\-\=<>\s\&\|\(\)\[\]\{\}\^\~\?\:\\/"])/g, '\\$1'); return value.replace(/([\!\*\+\-\=<>\s\&\|\(\)\[\]\{\}\^\~\?\:\\/"])/g, '\\$1');
...@@ -16,8 +17,7 @@ interface FieldAccessorCache { ...@@ -16,8 +17,7 @@ interface FieldAccessorCache {
} }
export class TemplateSrv { export class TemplateSrv {
variables: any[]; private _variables: any[];
private regex = variableRegex; private regex = variableRegex;
private index: any = {}; private index: any = {};
private grafanaVariables: any = {}; private grafanaVariables: any = {};
...@@ -28,11 +28,11 @@ export class TemplateSrv { ...@@ -28,11 +28,11 @@ export class TemplateSrv {
constructor() { constructor() {
this.builtIns['__interval'] = { text: '1s', value: '1s' }; this.builtIns['__interval'] = { text: '1s', value: '1s' };
this.builtIns['__interval_ms'] = { text: '100', value: '100' }; this.builtIns['__interval_ms'] = { text: '100', value: '100' };
this.variables = []; this._variables = [];
} }
init(variables: any, timeRange?: TimeRange) { init(variables: any, timeRange?: TimeRange) {
this.variables = variables; this._variables = variables;
this.timeRange = timeRange; this.timeRange = timeRange;
this.updateIndex(); this.updateIndex();
} }
...@@ -41,10 +41,28 @@ export class TemplateSrv { ...@@ -41,10 +41,28 @@ export class TemplateSrv {
return this.builtIns.__interval.value; return this.builtIns.__interval.value;
} }
/**
* @deprecated: this instance variable should not be used and will be removed in future releases
*
* Use getVariables function instead
*/
get variables(): any[] {
deprecationWarning('template_srv.ts', 'variables', 'getVariables');
return this.getVariables();
}
getVariables(): VariableModel[] {
if (getConfig().featureToggles.newVariables) {
return getVariableClones();
}
return this._variables;
}
updateIndex() { updateIndex() {
const existsOrEmpty = (value: any) => value || value === ''; const existsOrEmpty = (value: any) => value || value === '';
this.index = this.variables.reduce((acc, currentValue) => { this.index = this._variables.reduce((acc, currentValue) => {
if (currentValue.current && (currentValue.current.isNone || existsOrEmpty(currentValue.current.value))) { if (currentValue.current && (currentValue.current.isNone || existsOrEmpty(currentValue.current.value))) {
acc[currentValue.name] = currentValue; acc[currentValue.name] = currentValue;
} }
...@@ -345,7 +363,7 @@ export class TemplateSrv { ...@@ -345,7 +363,7 @@ export class TemplateSrv {
} }
fillVariableValuesForUrl(params: any, scopedVars?: ScopedVars) { fillVariableValuesForUrl(params: any, scopedVars?: ScopedVars) {
_.each(this.variables, variable => { _.each(this._variables, variable => {
if (scopedVars && scopedVars[variable.name] !== void 0) { if (scopedVars && scopedVars[variable.name] !== void 0) {
if (scopedVars[variable.name].skipUrlSync) { if (scopedVars[variable.name].skipUrlSync) {
return; return;
...@@ -387,8 +405,8 @@ export class TemplateSrv { ...@@ -387,8 +405,8 @@ export class TemplateSrv {
if (getConfig().featureToggles.newVariables) { if (getConfig().featureToggles.newVariables) {
return getFilteredVariables(isAdHoc); return getFilteredVariables(isAdHoc);
} }
if (Array.isArray(this.variables)) { if (Array.isArray(this._variables)) {
return this.variables.filter(isAdHoc); return this._variables.filter(isAdHoc);
} }
return []; return [];
}; };
......
public/app/plugins/datasource/cloudwatch/datasource.ts
...@@ -7,20 +7,21 @@ import { AppNotificationTimeout } from 'app/types'; ...@@ -7,20 +7,21 @@ import { AppNotificationTimeout } from 'app/types';
import { store } from 'app/store/store'; import { store } from 'app/store/store';
import kbn from 'app/core/utils/kbn'; import kbn from 'app/core/utils/kbn';
import { import {
DataQueryRequest,
DataSourceApi,
DataSourceInstanceSettings,
dateMath, dateMath,
ScopedVars, ScopedVars,
toDataFrame,
TimeRange, TimeRange,
DataSourceApi, toDataFrame,
DataQueryRequest,
DataSourceInstanceSettings,
} from '@grafana/data'; } from '@grafana/data';
import { getBackendSrv } from '@grafana/runtime'; import { getBackendSrv } from '@grafana/runtime';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
import { ThrottlingErrorMessage } from './components/ThrottlingErrorMessage'; import { ThrottlingErrorMessage } from './components/ThrottlingErrorMessage';
import memoizedDebounce from './memoizedDebounce'; import memoizedDebounce from './memoizedDebounce';
import { CloudWatchQuery, CloudWatchJsonData } from './types'; import { CloudWatchJsonData, CloudWatchQuery } from './types';
import { VariableWithMultiSupport } from 'app/features/templating/types';
const displayAlert = (datasourceName: string, region: string) => const displayAlert = (datasourceName: string, region: string) =>
store.dispatch( store.dispatch(
...@@ -121,7 +122,7 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, ...@@ -121,7 +122,7 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
} }
get variables() { get variables() {
return this.templateSrv.variables.map(v => `$${v.name}`); return this.templateSrv.getVariables().map(v => `$${v.name}`);
} }
getPeriod(target: any, options: any) { getPeriod(target: any, options: any) {
...@@ -562,9 +563,11 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, ...@@ -562,9 +563,11 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
return { ...result, [key]: value }; return { ...result, [key]: value };
} }
const valueVar = this.templateSrv.variables.find(({ name }) => name === this.templateSrv.getVariableName(value)); const valueVar = this.templateSrv
.getVariables()
.find(({ name }) => name === this.templateSrv.getVariableName(value));
if (valueVar) { if (valueVar) {
if (valueVar.multi) { if (((valueVar as unknown) as VariableWithMultiSupport).multi) {
const values = this.templateSrv.replace(value, scopedVars, 'pipe').split('|'); const values = this.templateSrv.replace(value, scopedVars, 'pipe').split('|');
return { ...result, [key]: values }; return { ...result, [key]: values };
} }
...@@ -577,8 +580,10 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, ...@@ -577,8 +580,10 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
replace(target: string, scopedVars: ScopedVars, displayErrorIfIsMultiTemplateVariable?: boolean, fieldName?: string) { replace(target: string, scopedVars: ScopedVars, displayErrorIfIsMultiTemplateVariable?: boolean, fieldName?: string) {
if (displayErrorIfIsMultiTemplateVariable) { if (displayErrorIfIsMultiTemplateVariable) {
const variable = this.templateSrv.variables.find(({ name }) => name === this.templateSrv.getVariableName(target)); const variable = this.templateSrv
if (variable && variable.multi) { .getVariables()
.find(({ name }) => name === this.templateSrv.getVariableName(target));
if (variable && ((variable as unknown) as VariableWithMultiSupport).multi) {
this.debouncedCustomAlert( this.debouncedCustomAlert(
'CloudWatch templating error', 'CloudWatch templating error',
`Multi template variables are not supported for ${fieldName || target}` `Multi template variables are not supported for ${fieldName || target}`
......
public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts
...@@ -207,7 +207,7 @@ export class CloudWatchQueryParameterCtrl { ...@@ -207,7 +207,7 @@ export class CloudWatchQueryParameterCtrl {
}); });
if (addTemplateVars) { if (addTemplateVars) {
_.each(templateSrv.variables, variable => { _.each(templateSrv.getVariables(), variable => {
segments.unshift( segments.unshift(
uiSegmentSrv.newSegment({ uiSegmentSrv.newSegment({
type: 'template', type: 'template',
......
public/app/plugins/datasource/grafana-azure-monitor-datasource/annotations_query_ctrl.ts
...@@ -74,6 +74,6 @@ export class AzureMonitorAnnotationsQueryCtrl { ...@@ -74,6 +74,6 @@ export class AzureMonitorAnnotationsQueryCtrl {
}; };
get templateVariables() { get templateVariables() {
return this.templateSrv.variables.map((t: any) => '$' + t.name); return this.templateSrv.getVariables().map((t: any) => '$' + t.name);
} }
} }
public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
...@@ -7,8 +7,7 @@ import kbn from 'app/core/utils/kbn'; ...@@ -7,8 +7,7 @@ import kbn from 'app/core/utils/kbn';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
import { auto, IPromise } from 'angular'; import { auto, IPromise } from 'angular';
import { DataFrame } from '@grafana/data'; import { DataFrame, PanelEvents } from '@grafana/data';
import { PanelEvents } from '@grafana/data';
export interface ResultFormat { export interface ResultFormat {
text: string; text: string;
...@@ -570,7 +569,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl { ...@@ -570,7 +569,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
}; };
get templateVariables() { get templateVariables() {
return this.templateSrv.variables.map(t => '$' + t.name); return this.templateSrv.getVariables().map(t => '$' + t.name);
} }
/* Application Insights Section */ /* Application Insights Section */
......
public/app/plugins/datasource/graphite/query_ctrl.ts
...@@ -158,7 +158,7 @@ export class GraphiteQueryCtrl extends QueryCtrl { ...@@ -158,7 +158,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
} }
// add template variables // add template variables
_.eachRight(this.templateSrv.variables, variable => { _.eachRight(this.templateSrv.getVariables(), variable => {
altSegments.unshift( altSegments.unshift(
this.uiSegmentSrv.newSegment({ this.uiSegmentSrv.newSegment({
type: 'template', type: 'template',
...@@ -369,7 +369,7 @@ export class GraphiteQueryCtrl extends QueryCtrl { ...@@ -369,7 +369,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
return this.datasource.getTagValuesAutoComplete(tagExpressions, tagKey, valuePrefix).then((values: any[]) => { return this.datasource.getTagValuesAutoComplete(tagExpressions, tagKey, valuePrefix).then((values: any[]) => {
const altValues = _.map(values, 'text'); const altValues = _.map(values, 'text');
// Add template variables as additional values // Add template variables as additional values
_.eachRight(this.templateSrv.variables, variable => { _.eachRight(this.templateSrv.getVariables(), variable => {
altValues.push('${' + variable.name + ':regex}'); altValues.push('${' + variable.name + ':regex}');
}); });
return mapToDropdownOptions(altValues); return mapToDropdownOptions(altValues);
......
public/app/plugins/datasource/influxdb/query_ctrl.ts
...@@ -267,7 +267,7 @@ export class InfluxQueryCtrl extends QueryCtrl { ...@@ -267,7 +267,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
}); });
if (addTemplateVars) { if (addTemplateVars) {
for (const variable of this.templateSrv.variables) { for (const variable of this.templateSrv.getVariables()) {
segments.unshift( segments.unshift(
this.uiSegmentSrv.newSegment({ this.uiSegmentSrv.newSegment({
type: 'value', type: 'value',
......
public/app/plugins/datasource/mysql/query_ctrl.ts
...@@ -9,6 +9,7 @@ import { auto } from 'angular'; ...@@ -9,6 +9,7 @@ import { auto } from 'angular';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
import { CoreEvents } from 'app/types'; import { CoreEvents } from 'app/types';
import { PanelEvents } from '@grafana/data'; import { PanelEvents } from '@grafana/data';
import { VariableWithMultiSupport } from 'app/features/templating/types';
export interface QueryMeta { export interface QueryMeta {
sql: string; sql: string;
...@@ -301,10 +302,10 @@ export class MysqlQueryCtrl extends QueryCtrl { ...@@ -301,10 +302,10 @@ export class MysqlQueryCtrl extends QueryCtrl {
}); });
if (config.addTemplateVars) { if (config.addTemplateVars) {
for (const variable of this.templateSrv.variables) { for (const variable of this.templateSrv.getVariables()) {
let value; let value;
value = '$' + variable.name; value = '$' + variable.name;
if (config.templateQuoter && variable.multi === false) { if (config.templateQuoter && ((variable as unknown) as VariableWithMultiSupport).multi === false) {
value = config.templateQuoter(value); value = config.templateQuoter(value);
} }
......
public/app/plugins/datasource/postgres/query_ctrl.ts
...@@ -9,6 +9,7 @@ import { auto } from 'angular'; ...@@ -9,6 +9,7 @@ import { auto } from 'angular';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
import { CoreEvents } from 'app/types'; import { CoreEvents } from 'app/types';
import { PanelEvents } from '@grafana/data'; import { PanelEvents } from '@grafana/data';
import { VariableWithMultiSupport } from 'app/features/templating/types';
export interface QueryMeta { export interface QueryMeta {
sql: string; sql: string;
...@@ -333,10 +334,10 @@ export class PostgresQueryCtrl extends QueryCtrl { ...@@ -333,10 +334,10 @@ export class PostgresQueryCtrl extends QueryCtrl {
}); });
if (config.addTemplateVars) { if (config.addTemplateVars) {
for (const variable of this.templateSrv.variables) { for (const variable of this.templateSrv.getVariables()) {
let value; let value;
value = '$' + variable.name; value = '$' + variable.name;
if (config.templateQuoter && variable.multi === false) { if (config.templateQuoter && ((variable as unknown) as VariableWithMultiSupport).multi === false) {
value = config.templateQuoter(value); value = config.templateQuoter(value);
} }
......
public/app/plugins/datasource/stackdriver/components/VariableQueryEditor.test.tsx
...@@ -4,6 +4,7 @@ import renderer from 'react-test-renderer'; ...@@ -4,6 +4,7 @@ import renderer from 'react-test-renderer';
import { StackdriverVariableQueryEditor } from './VariableQueryEditor'; import { StackdriverVariableQueryEditor } from './VariableQueryEditor';
import { VariableQueryProps } from 'app/types/plugins'; import { VariableQueryProps } from 'app/types/plugins';
import { MetricFindQueryTypes } from '../types'; import { MetricFindQueryTypes } from '../types';
import { VariableModel } from 'app/features/templating/types';
jest.mock('../functions', () => ({ jest.mock('../functions', () => ({
getMetricTypes: (): any => ({ metricTypes: [], selectedMetricType: '' }), getMetricTypes: (): any => ({ metricTypes: [], selectedMetricType: '' }),
...@@ -18,7 +19,7 @@ const props: VariableQueryProps = { ...@@ -18,7 +19,7 @@ const props: VariableQueryProps = {
getProjects: async (): Promise<any[]> => [], getProjects: async (): Promise<any[]> => [],
getMetricTypes: async (p: any): Promise<any[]> => [], getMetricTypes: async (p: any): Promise<any[]> => [],
}, },
templateSrv: { replace: (s: string) => s, variables: [] }, templateSrv: { replace: (s: string) => s, getVariables: () => ([] as unknown) as VariableModel[] },
}; };
describe('VariableQueryEditor', () => { describe('VariableQueryEditor', () => {
......
public/app/plugins/datasource/stackdriver/components/VariableQueryEditor.tsx
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import { VariableQueryProps } from 'app/types/plugins'; import { VariableQueryProps } from 'app/types/plugins';
import { SimpleSelect } from './'; import { SimpleSelect } from './';
import { getMetricTypes, getLabelKeys, extractServicesFromMetricDescriptors } from '../functions'; import { extractServicesFromMetricDescriptors, getLabelKeys, getMetricTypes } from '../functions';
import { MetricFindQueryTypes, VariableQueryData } from '../types'; import { MetricFindQueryTypes, VariableQueryData } from '../types';
export class StackdriverVariableQueryEditor extends PureComponent<VariableQueryProps, VariableQueryData> { export class StackdriverVariableQueryEditor extends PureComponent<VariableQueryProps, VariableQueryData> {
...@@ -143,7 +143,7 @@ export class StackdriverVariableQueryEditor extends PureComponent<VariableQueryP ...@@ -143,7 +143,7 @@ export class StackdriverVariableQueryEditor extends PureComponent<VariableQueryP
} }
insertTemplateVariables(options: any) { insertTemplateVariables(options: any) {
const templateVariables = this.props.templateSrv.variables.map((v: any) => ({ const templateVariables = this.props.templateSrv.getVariables().map((v: any) => ({
name: `$${v.name}`, name: `$${v.name}`,
value: `$${v.name}`, value: `$${v.name}`,
})); }));
......
public/app/plugins/datasource/stackdriver/datasource.ts
...@@ -2,13 +2,13 @@ import { stackdriverUnitMappings } from './constants'; ...@@ -2,13 +2,13 @@ import { stackdriverUnitMappings } from './constants';
import appEvents from 'app/core/app_events'; import appEvents from 'app/core/app_events';
import _ from 'lodash'; import _ from 'lodash';
import StackdriverMetricFindQuery from './StackdriverMetricFindQuery'; import StackdriverMetricFindQuery from './StackdriverMetricFindQuery';
import { StackdriverQuery, MetricDescriptor, StackdriverOptions, Filter, VariableQueryData } from './types'; import { Filter, MetricDescriptor, StackdriverOptions, StackdriverQuery, VariableQueryData } from './types';
import { import {
DataSourceApi,
DataQueryRequest, DataQueryRequest,
DataQueryResponse,
DataSourceApi,
DataSourceInstanceSettings, DataSourceInstanceSettings,
ScopedVars, ScopedVars,
DataQueryResponse,
} from '@grafana/data'; } from '@grafana/data';
import { getBackendSrv } from '@grafana/runtime'; import { getBackendSrv } from '@grafana/runtime';
import { TemplateSrv } from 'app/features/templating/template_srv'; import { TemplateSrv } from 'app/features/templating/template_srv';
...@@ -38,7 +38,7 @@ export default class StackdriverDatasource extends DataSourceApi<StackdriverQuer ...@@ -38,7 +38,7 @@ export default class StackdriverDatasource extends DataSourceApi<StackdriverQuer
} }
get variables() { get variables() {
return this.templateSrv.variables.map(v => `$${v.name}`); return this.templateSrv.getVariables().map(v => `$${v.name}`);
} }
async getTimeSeries(options: DataQueryRequest<StackdriverQuery>) { async getTimeSeries(options: DataQueryRequest<StackdriverQuery>) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment