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

Explore/Loki: Filter expression only treated as regex when regex operator is used (#21538)

Browse Source 
* Explore/Loki: Filter expression only treated as regex when regex operator is used
Closes #17963

* Adds test cases to verify new behavior
This commit is contained in:
kay delaney 2020-01-16 16:09:49 +00:00 committed by GitHub
parent 1636e8873b
commit 451e9beaf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/loki/query_utils.test.ts
View File

@ -92,4 +92,12 @@ describe('getHighlighterExpressionsFromQuery', () => {
it('returns null if filter term is not wrapped in double quotes', () => { it('returns null if filter term is not wrapped in double quotes', () => {
expect(getHighlighterExpressionsFromQuery('{foo="bar"} |= x')).toEqual(null); expect(getHighlighterExpressionsFromQuery('{foo="bar"} |= x')).toEqual(null);
}); });
it('escapes filter term if regex filter operator is not used', () => {
expect(getHighlighterExpressionsFromQuery('{foo="bar"} |= "x[yz].w"')).toEqual(['x\\[yz\\]\\.w']);
});
it('does not escape filter term if regex filter operator is used', () => {
expect(getHighlighterExpressionsFromQuery('{foo="bar"} |~ "x[yz].w" |~ "z.+"')).toEqual(['x[yz].w', 'z.+']);
});
}); });

5
public/app/plugins/datasource/loki/query_utils.ts
View File

@ -1,4 +1,5 @@
import { LokiExpression } from './types'; import { LokiExpression } from './types';
import escapeRegExp from 'lodash/escapeRegExp';
const selectorRegexp = /(?:^|\s){[^{]*}/g; const selectorRegexp = /(?:^|\s){[^{]*}/g;
export function parseQuery(input: string): LokiExpression { export function parseQuery(input: string): LokiExpression {
@ -45,6 +46,7 @@ export function getHighlighterExpressionsFromQuery(input: string): string[] {
break; break;
} }
// Drop terms for negative filters // Drop terms for negative filters
const filterOperator = expression.substr(filterStart, 2);
const skip = expression.substr(filterStart).search(/!=|!~/) === 0; const skip = expression.substr(filterStart).search(/!=|!~/) === 0;
expression = expression.substr(filterStart + 2); expression = expression.substr(filterStart + 2);
if (skip) { if (skip) {
@ -65,7 +67,8 @@ export function getHighlighterExpressionsFromQuery(input: string): string[] {
if (quotedTerm) { if (quotedTerm) {
const unwrappedFilterTerm = quotedTerm[1]; const unwrappedFilterTerm = quotedTerm[1];
results.push(unwrappedFilterTerm); const regexOperator = filterOperator === '|~';
results.push(regexOperator ? unwrappedFilterTerm : escapeRegExp(unwrappedFilterTerm));
} else { } else {
return null; return null;
} }