public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.0.x] InfluxDB: Fix measurement interpolation on visual query builder (#85456)

Browse Source 
InfluxDB: Fix measurement interpolation on visual query builder (#85423)

* fix measurement interpolation

* fix unit test

* fix unit test 2

(cherry picked from commit 64236a3923)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-04-02 12:47:36 +02:00
committed by GitHub
co-authored by ismail simsek
parent ed1485fa95
commit d4c72e9841
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/influxdb/datasource.test.ts
+1 -1
View File
@@ -289,7 +289,7 @@ describe('InfluxDataSource Frontend Mode', () => {
function influxChecks(query: InfluxQuery) {
expect(templateSrv.replace).toBeCalledTimes(12);
expect(query.alias).toBe(text);
expect(query.measurement).toBe(justText);
expect(query.measurement).toBe(textWithFormatRegex);
expect(query.policy).toBe(justText);
expect(query.limit).toBe(justText);
expect(query.slimit).toBe(justText);
public/app/plugins/datasource/influxdb/datasource.ts
+6 -1
View File
@@ -297,7 +297,12 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
), // The raw sql query text
alias: this.templateSrv.replace(query.alias ?? '', scopedVars),
limit: this.templateSrv.replace(query.limit?.toString() ?? '', scopedVars),
measurement: this.templateSrv.replace(query.measurement ?? '', scopedVars),
measurement: this.templateSrv.replace(
query.measurement ?? '',
scopedVars,
(value: string | string[] = [], variable: QueryVariableModel) =>
this.interpolateQueryExpr(value, variable, query.measurement)
),
policy: this.templateSrv.replace(query.policy ?? '', scopedVars),
slimit: this.templateSrv.replace(query.slimit?.toString() ?? '', scopedVars),
tz: this.templateSrv.replace(query.tz ?? '', scopedVars),
public/app/plugins/datasource/influxdb/datasource_backend_mode.test.ts
+1 -1
View File
@@ -180,7 +180,7 @@ describe('InfluxDataSource Backend Mode', () => {
function influxChecks(query: InfluxQuery) {
expect(templateSrv.replace).toBeCalledTimes(12);
expect(query.alias).toBe(text);
expect(query.measurement).toBe(justText);
expect(query.measurement).toBe(textWithFormatRegex);
expect(query.policy).toBe(justText);
expect(query.limit).toBe(justText);
expect(query.slimit).toBe(justText);