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

Logging: fix query parsing for selectors with multiple labels

Browse Source 
- simplify selector parsing
- added tests
This commit is contained in:
David Kaltschmidt
2018-11-28 14:03:47 +01:00
parent 32511533c3
commit 9c316b55e9
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/logging/datasource.test.ts
View File

@@ -35,4 +35,11 @@ describe('parseQuery', () => {
regexp: 'x|y', regexp: 'x|y',
}); });
}); });
it('returns query for selector with two labels', () => {
expect(parseQuery('{foo="bar", baz="42"}')).toEqual({
query: '{foo="bar", baz="42"}',
regexp: '',
});
});
}); });

21
public/app/plugins/datasource/logging/datasource.ts
View File

@@ -16,26 +16,15 @@ const DEFAULT_QUERY_PARAMS = {
query: '', query: '',
}; };
const QUERY_REGEXP = /({\w+="[^"]+"})?\s*(\w[^{]+)?\s*({\w+="[^"]+"})?/; const selectorRegexp = /{[^{]*}/g;
export function parseQuery(input: string) { export function parseQuery(input: string) {
const match = input.match(QUERY_REGEXP); const match = input.match(selectorRegexp);
let query = ''; let query = '';
let regexp = ''; let regexp = input;
if (match) { if (match) {
if (match[1]) { query = match[0];
query = match[1]; regexp = input.replace(selectorRegexp, '').trim();
}
if (match[2]) {
regexp = match[2].trim();
}
if (match[3]) {
if (match[1]) {
query = `${match[1].slice(0, -1)},${match[3].slice(1)}`;
} else {
query = match[3];
}
}
} }
return { query, regexp }; return { query, regexp };