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

11503: escape measurement filter regex value

Browse Source
This commit is contained in:
SamuelToh 2019-01-10 10:47:22 +10:00
parent 032d69fc21
commit 9e3ab71e40
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/influxdb/query_builder.ts
View File

@ -1,4 +1,5 @@
import _ from 'lodash';
import kbn from 'app/core/utils/kbn';
function renderTagCondition(tag, index) {
let str = '';
@ -43,7 +44,7 @@ export class InfluxQueryBuilder {
} else if (type === 'MEASUREMENTS') {
query = 'SHOW MEASUREMENTS';
if (withMeasurementFilter) {
query += ' WITH MEASUREMENT =~ /' + withMeasurementFilter + '/';
query += ' WITH MEASUREMENT =~ /' + kbn.regexEscape(withMeasurementFilter) + '/';
}
} else if (type === 'FIELDS') {
measurement = this.target.measurement;

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

@ -50,6 +50,12 @@ describe('InfluxQueryBuilder', () => {
expect(query).toBe('SHOW MEASUREMENTS WITH MEASUREMENT =~ /something/ LIMIT 100');
});
it('should escape the regex value in measurement query', () => {
const builder = new InfluxQueryBuilder({ measurement: '', tags: [] });
const query = builder.buildExploreQuery('MEASUREMENTS', undefined, 'abc/edf/');
expect(query).toBe('SHOW MEASUREMENTS WITH MEASUREMENT =~ /abc\\/edf\\// LIMIT 100');
});
it('should have WITH MEASUREMENT WHERE in measurement query for non-empty query with tags', () => {
const builder = new InfluxQueryBuilder({
measurement: '',