diff --git a/public/app/plugins/datasource/influxdb/datasource.test.ts b/public/app/plugins/datasource/influxdb/datasource.test.ts index 5e20d38370a..01f1ab2f7e6 100644 --- a/public/app/plugins/datasource/influxdb/datasource.test.ts +++ b/public/app/plugins/datasource/influxdb/datasource.test.ts @@ -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); }); }); diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index b3837a09871..d5be06528aa 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -309,7 +309,8 @@ export default class InfluxDatasource extends DataSourceWithBackend 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 escapeRegex(v)).join('|'); + // then put inside parenthesis. + return `(${value.map((v) => escapeRegex(v)).join('|')})`; } return value;