IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: Fix interpolation of multi value template variables by adding parenthesis around them (#83577)

Browse Source 
Put parenthesis around multi value template variable
This commit is contained in:
ismail simsek 2024-02-28 15:59:06 +01:00 committed by GitHub
parent 7d6d256335
commit 757fa06b85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/influxdb/datasource.test.ts
View File

@ -452,7 +452,7 @@ describe('InfluxDataSource Frontend Mode', () => {
.withIncludeAll(true)
.build();
const result = ds.interpolateQueryExpr(value, variableMock, 'select from /^($tempVar)$/');
const expectation = `env|env2|env3`;
const expectation = `(env|env2|env3)`;
expect(result).toBe(expectation);
});
@ -476,7 +476,7 @@ describe('InfluxDataSource Frontend Mode', () => {
const value = [`/special/path`, `/some/other/path`];
const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti().build();
const result = ds.interpolateQueryExpr(value, variableMock, `select that where path = '$tempVar'`);
const expectation = `\\/special\\/path|\\/some\\/other\\/path`;
const expectation = `(\\/special\\/path|\\/some\\/other\\/path)`;
expect(result).toBe(expectation);
});
@ -505,7 +505,7 @@ describe('InfluxDataSource Frontend Mode', () => {
.build();
const value = [`/special/path`, `/some/other/path`];
const result = ds.interpolateQueryExpr(value, variableMock, `select that where path = /$tempVar/`);
const expectation = `\\/special\\/path|\\/some\\/other\\/path`;
const expectation = `(\\/special\\/path|\\/some\\/other\\/path)`;
expect(result).toBe(expectation);
});
});

6
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -309,7 +309,8 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
}
// If the value is a string array first escape them then join them with pipe
return value.map((v) => escapeRegex(v)).join('|');
// then put inside parenthesis.
return `(${value.map((v) => escapeRegex(v)).join('|')})`;
}
// If the variable is not a multi-value variable
@ -324,7 +325,8 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
}
// If the value is a string array first escape them then join them with pipe
return value.map((v) => escapeRegex(v)).join('|');
// then put inside parenthesis.
return `(${value.map((v) => escapeRegex(v)).join('|')})`;
}
return value;