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

Loki: Remove appending of (?i) in Loki query editor if not added by user (#20908)

Browse Source
This commit is contained in:
Ivana Huckova 2019-12-06 18:04:13 +01:00 committed by GitHub
parent b4736558ac
commit 23327fcdea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/loki/datasource.ts
View File

@ -439,13 +439,13 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
case 'ADD_FILTER': {
selectorLabels = addLabelToSelector(selector, action.key, action.value);
selectorFilters = keepSelectorFilters(selector);
selector = `${selectorLabels} ${selectorFilters}`;
selector = `${selectorLabels} ${selectorFilters}`.trim();
break;
}
case 'ADD_FILTER_OUT': {
selectorLabels = addLabelToSelector(selector, action.key, action.value, '!=');
selectorFilters = keepSelectorFilters(selector);
selector = `${selectorLabels} ${selectorFilters}`;
selector = `${selectorLabels} ${selectorFilters}`.trim();
break;
}
default:

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

@ -26,14 +26,14 @@ describe('parseQuery', () => {
it('returns query for strings with query and search string', () => {
expect(parseQuery('x {foo="bar"}')).toEqual({
query: '{foo="bar"}',
regexp: '(?i)x',
regexp: 'x',
} as LokiExpression);
});
it('returns query for strings with query and regexp', () => {
expect(parseQuery('{foo="bar"} x|y')).toEqual({
query: '{foo="bar"}',
regexp: '(?i)x|y',
regexp: 'x|y',
} as LokiExpression);
});
@ -47,11 +47,11 @@ describe('parseQuery', () => {
it('returns query and regexp with quantifiers', () => {
expect(parseQuery('{foo="bar"} \\.java:[0-9]{1,5}')).toEqual({
query: '{foo="bar"}',
regexp: '(?i)\\.java:[0-9]{1,5}',
regexp: '\\.java:[0-9]{1,5}',
} as LokiExpression);
expect(parseQuery('\\.java:[0-9]{1,5} {foo="bar"}')).toEqual({
query: '{foo="bar"}',
regexp: '(?i)\\.java:[0-9]{1,5}',
regexp: '\\.java:[0-9]{1,5}',
} as LokiExpression);
});
@ -73,8 +73,8 @@ describe('getHighlighterExpressionsFromQuery', () => {
});
it('returns a single expressions for legacy query', () => {
expect(getHighlighterExpressionsFromQuery('{} x')).toEqual(['(?i)x']);
expect(getHighlighterExpressionsFromQuery('{foo="bar"} x')).toEqual(['(?i)x']);
expect(getHighlighterExpressionsFromQuery('{} x')).toEqual(['x']);
expect(getHighlighterExpressionsFromQuery('{foo="bar"} x')).toEqual(['x']);
});
it('returns an expression for query with filter', () => {

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

@ -1,7 +1,6 @@
import { LokiExpression } from './types';
const selectorRegexp = /(?:^|\s){[^{]*}/g;
const caseInsensitive = '(?i)'; // Golang mode modifier for Loki, doesn't work in JavaScript
export function parseQuery(input: string): LokiExpression {
input = input || '';
const match = input.match(selectorRegexp);
@ -9,13 +8,11 @@ export function parseQuery(input: string): LokiExpression {
let regexp = '';
if (match) {
// Regexp result is ignored on the server side
regexp = input.replace(selectorRegexp, '').trim();
// Keep old-style regexp, otherwise take whole query
if (regexp && regexp.search(/\|=|\|~|!=|!~/) === -1) {
query = match[0].trim();
if (!regexp.startsWith(caseInsensitive)) {
regexp = `${caseInsensitive}${regexp}`;
}
} else {
regexp = '';
}