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

InfluxDB: Fix variable interpolation in influx db (#92988)

Browse Source 
Fix variable interpolation in influx db
This commit is contained in:
Oscar Kilhed 2024-09-09 15:35:30 +02:00 committed by GitHub
parent 58907a8464
commit c0df15dcde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,11 +324,6 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
} }
interpolateQueryExpr(value: string | string[] = [], variable: QueryVariableModel, query?: string) { interpolateQueryExpr(value: string | string[] = [], variable: QueryVariableModel, query?: string) {
// If there is no query just return the value directly
if (!query) {
return value;
}
if (typeof value === 'string') { if (typeof value === 'string') {
// Check the value is a number. If not run to escape special characters // Check the value is a number. If not run to escape special characters
if (!isNaN(parseFloat(value))) { if (!isNaN(parseFloat(value))) {
@ -358,7 +353,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
// regex below checks if the variable inside /^...$/ (^ and $ is optional) // regex below checks if the variable inside /^...$/ (^ and $ is optional)
// i.e. /^$myVar$/ or /$myVar/ or /^($myVar)$/ // i.e. /^$myVar$/ or /$myVar/ or /^($myVar)$/
const regex = new RegExp(`\\/(?:\\^)?(.*)(\\$${variable.name})(.*)(?:\\$)?\\/`, 'gm'); const regex = new RegExp(`\\/(?:\\^)?(.*)(\\$${variable.name})(.*)(?:\\$)?\\/`, 'gm');
if (regex.test(query)) { if (query && regex.test(query)) {
if (typeof value === 'string') { if (typeof value === 'string') {
return escapeRegex(value); return escapeRegex(value);
} }