From fcdf4ee25cd1eb533d3749cfd3179462c2461d8c Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 10 Jun 2021 05:38:53 -0400 Subject: [PATCH] GoogleCloudMonitoring: Fix query object for panels prior to v7 (#35449) (#35483) * Fix query object for cloudmonitor panel from v6 * Use proper function (cherry picked from commit 83b6df738eef83cb99932f399107da6a71b3063c) Co-authored-by: Andres Martinez Gotor --- public/app/plugins/datasource/cloud-monitoring/datasource.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.ts index 8c8d377f993..f8b058cd005 100644 --- a/public/app/plugins/datasource/cloud-monitoring/datasource.ts +++ b/public/app/plugins/datasource/cloud-monitoring/datasource.ts @@ -343,7 +343,9 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend< } interpolateVariablesInQueries(queries: CloudMonitoringQuery[], scopedVars: ScopedVars): CloudMonitoringQuery[] { - return queries.map((query) => this.applyTemplateVariables(query, scopedVars) as CloudMonitoringQuery); + return queries.map( + (query) => this.applyTemplateVariables(this.migrateQuery(query), scopedVars) as CloudMonitoringQuery + ); } interpolateFilters(filters: string[], scopedVars: ScopedVars) {