IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-04 13:17:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Loki: Append refId to logs uid (#30418)

Browse Source 
* Append refId to Loki uid, add tests

* Fix linting

* Fix linting

* Hopefully finally fix linting errors
This commit is contained in:
Ivana Huckova 2021-01-22 11:09:09 +01:00 committed by GitHub
parent 8bd5cdbe9f
commit 6692e1c332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/loki/live_streams.test.ts
View File

@ -48,7 +48,7 @@ describe('Live Stream Tests', () => {
expect(last).toEqual({ expect(last).toEqual({
ts: '2019-08-28T20:50:40.118Z', ts: '2019-08-28T20:50:40.118Z',
tsNs: '1567025440118944705', tsNs: '1567025440118944705',
id: '8c50d09800ce8dda69a2ff25405c9f65', id: '8c50d09800ce8dda69a2ff25405c9f65_A',
line: 'Kittens', line: 'Kittens',
labels: { filename: '/var/log/sntpc.log' }, labels: { filename: '/var/log/sntpc.log' },
}); });

1
public/app/plugins/datasource/loki/live_streams.ts
View File

@ -36,6 +36,7 @@ export class LiveStreams {
data.addField({ name: 'labels', type: FieldType.other }); // The labels for each line data.addField({ name: 'labels', type: FieldType.other }); // The labels for each line
data.addField({ name: 'id', type: FieldType.string }); data.addField({ name: 'id', type: FieldType.string });
data.meta = { ...data.meta, preferredVisualisationType: 'logs' }; data.meta = { ...data.meta, preferredVisualisationType: 'logs' };
data.refId = target.refId;
stream = webSocket(target.url).pipe( stream = webSocket(target.url).pipe(
map((response: LokiTailResponse) => { map((response: LokiTailResponse) => {

20
public/app/plugins/datasource/loki/result_transformer.test.ts
View File

@ -109,6 +109,13 @@ describe('loki result transformer', () => {
expect(data[0].fields[2].values.get(3)).toEqual('65cee200875f58ee1430d8bd2e8b74e7_2'); expect(data[0].fields[2].values.get(3)).toEqual('65cee200875f58ee1430d8bd2e8b74e7_2');
expect(data[1].fields[2].values.get(0)).not.toEqual('65cee200875f58ee1430d8bd2e8b74e7_3'); expect(data[1].fields[2].values.get(0)).not.toEqual('65cee200875f58ee1430d8bd2e8b74e7_3');
}); });
it('should append refId to the unique ids if refId is provided', () => {
const data = streamResult.map((stream) => ResultTransformer.lokiStreamResultToDataFrame(stream, false, 'B'));
expect(data.length).toBe(2);
expect(data[0].fields[2].values.get(0)).toEqual('2b431b8a98b80b3b2c2f4cd2444ae6cb_B');
expect(data[1].fields[2].values.get(0)).toEqual('75d73d66cff40f9d1a1f2d5a0bf295d0_B');
});
}); });
describe('lokiStreamsToDataFrames', () => { describe('lokiStreamsToDataFrames', () => {
@ -196,14 +203,15 @@ describe('loki result transformer', () => {
data.addField({ name: 'line', type: FieldType.string }).labels = { job: 'grafana' }; data.addField({ name: 'line', type: FieldType.string }).labels = { job: 'grafana' };
data.addField({ name: 'labels', type: FieldType.other }); data.addField({ name: 'labels', type: FieldType.other });
data.addField({ name: 'id', type: FieldType.string }); data.addField({ name: 'id', type: FieldType.string });
data.refId = 'C';
ResultTransformer.appendResponseToBufferedData(tailResponse, data); ResultTransformer.appendResponseToBufferedData(tailResponse, data);
expect(data.get(0).id).toEqual('870e4d105741bdfc2c67904ee480d4f3'); expect(data.get(0).id).toEqual('870e4d105741bdfc2c67904ee480d4f3_C');
expect(data.get(1).id).toEqual('870e4d105741bdfc2c67904ee480d4f3_1'); expect(data.get(1).id).toEqual('870e4d105741bdfc2c67904ee480d4f3_1_C');
expect(data.get(2).id).toEqual('707e4ec2b842f389dbb993438505856d'); expect(data.get(2).id).toEqual('707e4ec2b842f389dbb993438505856d_C');
expect(data.get(3).id).toEqual('78f044015a58fad3e257a855b167d85e'); expect(data.get(3).id).toEqual('78f044015a58fad3e257a855b167d85e_C');
expect(data.get(4).id).toEqual('870e4d105741bdfc2c67904ee480d4f3_2'); expect(data.get(4).id).toEqual('870e4d105741bdfc2c67904ee480d4f3_2_C');
expect(data.get(5).id).toEqual('707e4ec2b842f389dbb993438505856d_1'); expect(data.get(5).id).toEqual('707e4ec2b842f389dbb993438505856d_1_C');
}); });
}); });

11
public/app/plugins/datasource/loki/result_transformer.ts
View File

@ -61,7 +61,7 @@ export function lokiStreamResultToDataFrame(stream: LokiStreamResult, reverse?:
times.add(new Date(parseInt(ts.substr(0, ts.length - 6), 10)).toISOString()); times.add(new Date(parseInt(ts.substr(0, ts.length - 6), 10)).toISOString());
timesNs.add(ts); timesNs.add(ts);
lines.add(line); lines.add(line);
uids.add(createUid(ts, labelsString, line, usedUids)); uids.add(createUid(ts, labelsString, line, usedUids, refId));
} }
return constructDataFrame(times, timesNs, lines, uids, labels, reverse, refId); return constructDataFrame(times, timesNs, lines, uids, labels, reverse, refId);
@ -148,12 +148,12 @@ export function appendResponseToBufferedData(response: LokiTailResponse, data: M
tsNsField.values.add(ts); tsNsField.values.add(ts);
lineField.values.add(line); lineField.values.add(line);
labelsField.values.add(unique); labelsField.values.add(unique);
idField.values.add(createUid(ts, allLabelsString, line, usedUids)); idField.values.add(createUid(ts, allLabelsString, line, usedUids, data.refId));
} }
} }
} }
function createUid(ts: string, labelsString: string, line: string, usedUids: any): string { function createUid(ts: string, labelsString: string, line: string, usedUids: any, refId?: string): string {
// Generate id as hashed nanosecond timestamp, labels and line (this does not have to be unique) // Generate id as hashed nanosecond timestamp, labels and line (this does not have to be unique)
let id = md5(`${ts}_${labelsString}_${line}`); let id = md5(`${ts}_${labelsString}_${line}`);
@ -170,6 +170,9 @@ function createUid(ts: string, labelsString: string, line: string, usedUids: any
usedUids[id] = 0; usedUids[id] = 0;
} }
// Return unique id // Return unique id
if (refId) {
return `${id}_${refId}`;
}
return id; return id;
} }
@ -354,7 +357,7 @@ export function lokiStreamsToDataFrames(
}; };
const series: DataFrame[] = data.map((stream) => { const series: DataFrame[] = data.map((stream) => {
const dataFrame = lokiStreamResultToDataFrame(stream, reverse); const dataFrame = lokiStreamResultToDataFrame(stream, reverse, target.refId);
enhanceDataFrame(dataFrame, config); enhanceDataFrame(dataFrame, config);
if (meta.custom && dataFrame.fields.some((f) => f.labels && Object.keys(f.labels).some((l) => l === '__error__'))) { if (meta.custom && dataFrame.fields.some((f) => f.labels && Object.keys(f.labels).some((l) => l === '__error__'))) {