root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 31 Packages Projects Releases Wiki Activity

InfluxDB: InfluxQL: handle empty tag values when generating query (#34463)

This commit is contained in:
Gábor Farkas 2021-05-20 10:13:15 +02:00 committed by GitHub
parent 7b04278834
commit fc04a1ae00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@ function renderTagCondition(tag: { operator: any; value: string; condition: any;
}
}
// quote value unless regex or number
if (operator !== '=~' && operator !== '!~' && isNaN(+value)) {
// quote value unless regex or number, or if empty-string
if (value === '' || (operator !== '=~' && operator !== '!~' && isNaN(+value))) {
value = "'" + value + "'";
}

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

@ -159,5 +159,41 @@ describe('InfluxQueryBuilder', () => {
const query = builder.buildExploreQuery('RETENTION POLICIES');
expect(query).toBe('SHOW RETENTION POLICIES on "site"');
});
it('should handle tag-value=number-ish when getting measurements', () => {
const builder = new InfluxQueryBuilder(
{ measurement: undefined, tags: [{ key: 'app', value: '42', operator: '==' }] },
undefined
);
const query = builder.buildExploreQuery('MEASUREMENTS');
expect(query).toBe(`SHOW MEASUREMENTS WHERE "app" == 42 LIMIT 100`);
});
it('should handle tag-value=number-ish getting tag-keys', () => {
const builder = new InfluxQueryBuilder(
{ measurement: undefined, tags: [{ key: 'app', value: '42', operator: '==' }] },
undefined
);
const query = builder.buildExploreQuery('TAG_KEYS');
expect(query).toBe(`SHOW TAG KEYS WHERE "app" == 42`);
});
it('should handle tag-value=emptry-string when getting measurements', () => {
const builder = new InfluxQueryBuilder(
{ measurement: undefined, tags: [{ key: 'app', value: '', operator: '==' }] },
undefined
);
const query = builder.buildExploreQuery('MEASUREMENTS');
expect(query).toBe(`SHOW MEASUREMENTS WHERE "app" == '' LIMIT 100`);
});
it('should handle tag-value=emptry-string when getting tag-keys', () => {
const builder = new InfluxQueryBuilder(
{ measurement: undefined, tags: [{ key: 'app', value: '', operator: '==' }] },
undefined
);
const query = builder.buildExploreQuery('TAG_KEYS');
expect(query).toBe(`SHOW TAG KEYS WHERE "app" == ''`);
});
});
});