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

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

Browse Source 
* 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>
This commit is contained in:
Hugo Häggmark
2020-03-24 16:03:53 +01:00
committed by GitHub
parent 441e87d4d4
commit 31ad86ffc0
16 changed files with 82 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@@ -9,6 +9,7 @@ import { auto } from 'angular';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { CoreEvents } from 'app/types';
import { PanelEvents } from '@grafana/data';
import { VariableWithMultiSupport } from 'app/features/templating/types';
export interface QueryMeta {
sql: string;
@@ -333,10 +334,10 @@ export class PostgresQueryCtrl extends QueryCtrl {
});
if (config.addTemplateVars) {
for (const variable of this.templateSrv.variables) {
for (const variable of this.templateSrv.getVariables()) {
let value;
value = '$' + variable.name;
if (config.templateQuoter && variable.multi === false) {
if (config.templateQuoter && ((variable as unknown) as VariableWithMultiSupport).multi === false) {
value = config.templateQuoter(value);
}