IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14257 from grafana/davkal/fix-14250

Browse Source 
Explore: Fix logging query parser for regex with quantifiers
This commit is contained in:
Torkel Ödegaard 2018-12-03 12:25:10 +01:00 committed by GitHub
commit d16b348868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/logging/query_utils.test.ts
View File

@ -42,4 +42,15 @@ describe('parseQuery', () => {
regexp: '', regexp: '',
}); });
}); });
it('returns query and regexp with quantifiers', () => {
expect(parseQuery('{foo="bar"} \\.java:[0-9]{1,5}')).toEqual({
query: '{foo="bar"}',
regexp: '\\.java:[0-9]{1,5}',
});
expect(parseQuery('\\.java:[0-9]{1,5} {foo="bar"}')).toEqual({
query: '{foo="bar"}',
regexp: '\\.java:[0-9]{1,5}',
});
});
}); });

4
public/app/plugins/datasource/logging/query_utils.ts
View File

@ -1,11 +1,11 @@
const selectorRegexp = /{[^{]*}/g; const selectorRegexp = /(?:^|\s){[^{]*}/g;
export function parseQuery(input: string) { export function parseQuery(input: string) {
const match = input.match(selectorRegexp); const match = input.match(selectorRegexp);
let query = ''; let query = '';
let regexp = input; let regexp = input;
if (match) { if (match) {
query = match[0]; query = match[0].trim();
regexp = input.replace(selectorRegexp, '').trim(); regexp = input.replace(selectorRegexp, '').trim();
} }