root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 236 Packages Projects Releases Wiki Activity

TemplateSrv: expose the replace function (#24353)

This commit is contained in:
Ryan McKinley 2020-05-06 11:15:31 -07:00 committed by GitHub
parent fa260fec87
commit d891cc5949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grafana-runtime/src/services/templateSrv.ts
View File

@ -1,4 +1,4 @@
import { VariableModel } from '@grafana/data'; import { VariableModel, ScopedVars } from '@grafana/data';
/** /**
* Via the TemplateSrv consumers get access to all the available template variables * Via the TemplateSrv consumers get access to all the available template variables
@ -8,7 +8,15 @@ import { VariableModel } from '@grafana/data';
* @public * @public
*/ */
export interface TemplateSrv { export interface TemplateSrv {
/**
* List the dashboard variables
*/
getVariables(): VariableModel[]; getVariables(): VariableModel[];
/**
* Replace the values within the target string. See also {@link InterpolateFunction}
*/
replace(target: string, scopedVars?: ScopedVars, format?: string | Function): string;
} }
let singletonInstance: TemplateSrv; let singletonInstance: TemplateSrv;

2
public/app/features/templating/template_srv.ts
View File

@ -317,7 +317,7 @@ export class TemplateSrv implements BaseTemplateSrv {
return scopedVar.value; return scopedVar.value;
} }
replace(target: string, scopedVars?: ScopedVars, format?: string | Function): any { replace(target: string, scopedVars?: ScopedVars, format?: string | Function): string {
if (!target) { if (!target) {
return target; return target;
} }

2
public/app/plugins/datasource/cloudwatch/datasource.ts
View File

@ -300,7 +300,7 @@ export class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery, CloudWa
} }
getPeriod(target: CloudWatchMetricsQuery, options: any) { getPeriod(target: CloudWatchMetricsQuery, options: any) {
let period = this.templateSrv.replace(target.period, options.scopedVars); let period = this.templateSrv.replace(target.period, options.scopedVars) as any;
if (period && period.toLowerCase() !== 'auto') { if (period && period.toLowerCase() !== 'auto') {
if (/^\d+$/.test(period)) { if (/^\d+$/.test(period)) {
period = parseInt(period, 10); period = parseInt(period, 10);