opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Loki: Fix derived fields with undefined matcherType (#78849)

Browse Source 
Loki: Fix derived fields with no `matcherType`
This commit is contained in:
Sven Grossmann
2023-11-29 20:55:00 +01:00
committed by GitHub
parent 25c152c4d8
commit a50be7ea0a
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
public/app/plugins/datasource/loki/getDerivedFields.test.ts
View File

@ -154,4 +154,41 @@ describe('getDerivedFields', () => {
const trace4 = newFields.find((f) => f.name === 'trace4Name');
expect(trace4!.values).toEqual([null, null, null, null]);
});
it('adds links to fields with no `matcherType`', () => {
const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
const newFields = getDerivedFields(df, [
{
matcherRegex: 'trace1=(\\w+)',
name: 'trace1',
url: 'http://localhost/${__value.raw}',
},
]);
expect(newFields.length).toBe(1);
const trace1 = newFields.find((f) => f.name === 'trace1');
expect(trace1!.values).toEqual([null, '1234', null]);
expect(trace1!.config.links![0]).toEqual({
url: 'http://localhost/${__value.raw}',
title: '',
});
});
it('adds links to fields with `matcherType=regex`', () => {
const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
const newFields = getDerivedFields(df, [
{
matcherRegex: 'trace1=(\\w+)',
matcherType: 'regex',
name: 'trace1',
url: 'http://localhost/${__value.raw}',
},
]);
expect(newFields.length).toBe(1);
const trace1 = newFields.find((f) => f.name === 'trace1');
expect(trace1!.values).toEqual([null, '1234', null]);
expect(trace1!.config.links![0]).toEqual({
url: 'http://localhost/${__value.raw}',
title: '',
});
});
});

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

@ -41,7 +41,10 @@ export function getDerivedFields(dataFrame: DataFrame, derivedFieldConfigs: Deri
}
}
field.values.push(null);
} else if (derivedFieldsGrouped[field.name][0].matcherType === 'regex') {
} else if (
derivedFieldsGrouped[field.name][0].matcherType === 'regex' ||
derivedFieldsGrouped[field.name][0].matcherType === undefined
) {
// `matcherRegex` will actually be used as a RegExp here
const line = lineField.values[i];
const logMatch = line.match(derivedFieldsGrouped[field.name][0].matcherRegex);