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: influxql query editor: fix escaping problematic characters (#39170)

Browse Source
This commit is contained in:
Gábor Farkas 2021-09-14 12:55:43 +02:00 committed by GitHub
parent ad971cc9be
commit 27e3fda7ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/influxdb/influx_query_model.ts
View File

@ -142,6 +142,7 @@ export default class InfluxQueryModel {
} }
private renderTagCondition(tag: InfluxQueryTag, index: number, interpolate?: boolean) { private renderTagCondition(tag: InfluxQueryTag, index: number, interpolate?: boolean) {
// FIXME: merge this function with query_builder/renderTagCondition
let str = ''; let str = '';
let operator = tag.operator; let operator = tag.operator;
let value = tag.value; let value = tag.value;

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

@ -2,6 +2,7 @@ import { reduce } from 'lodash';
import kbn from 'app/core/utils/kbn'; import kbn from 'app/core/utils/kbn';
function renderTagCondition(tag: { operator: any; value: string; condition: any; key: string }, index: number) { function renderTagCondition(tag: { operator: any; value: string; condition: any; key: string }, index: number) {
// FIXME: merge this function with influx_query_model/renderTagCondition
let str = ''; let str = '';
let operator = tag.operator; let operator = tag.operator;
let value = tag.value; let value = tag.value;
@ -19,7 +20,7 @@ function renderTagCondition(tag: { operator: any; value: string; condition: any;
// quote value unless regex or number, or if empty-string // quote value unless regex or number, or if empty-string
if (value === '' || (operator !== '=~' && operator !== '!~' && isNaN(+value))) { if (value === '' || (operator !== '=~' && operator !== '!~' && isNaN(+value))) {
value = "'" + value + "'"; value = "'" + value.replace(/\\/g, '\\\\').replace(/\'/g, "\\'") + "'";
} }
return str + '"' + tag.key + '" ' + operator + ' ' + value; return str + '"' + tag.key + '" ' + operator + ' ' + value;

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

@ -178,6 +178,24 @@ describe('InfluxQueryBuilder', () => {
expect(query).toBe(`SHOW TAG KEYS WHERE "app" == 42`); expect(query).toBe(`SHOW TAG KEYS WHERE "app" == 42`);
}); });
it('should handle tag-value-contains-backslash-character getting tag-keys', () => {
const builder = new InfluxQueryBuilder(
{ measurement: undefined, tags: [{ key: 'app', value: 'lab\\el', operator: '==' }] },
undefined
);
const query = builder.buildExploreQuery('TAG_KEYS');
expect(query).toBe(`SHOW TAG KEYS WHERE "app" == 'lab\\\\el'`);
});
it('should handle tag-value-contains-single-quote-character getting tag-keys', () => {
const builder = new InfluxQueryBuilder(
{ measurement: undefined, tags: [{ key: 'app', value: "lab'el", operator: '==' }] },
undefined
);
const query = builder.buildExploreQuery('TAG_KEYS');
expect(query).toBe(`SHOW TAG KEYS WHERE "app" == 'lab\\'el'`);
});
it('should handle tag-value=emptry-string when getting measurements', () => { it('should handle tag-value=emptry-string when getting measurements', () => {
const builder = new InfluxQueryBuilder( const builder = new InfluxQueryBuilder(
{ measurement: undefined, tags: [{ key: 'app', value: '', operator: '==' }] }, { measurement: undefined, tags: [{ key: 'app', value: '', operator: '==' }] },