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: Allow multiple derived fields with the same name (#24437)

Browse Source
This commit is contained in:
Andrej Ocenas
2020-05-12 17:20:00 +02:00
committed by GitHub
parent 0ac006edf5
commit a50cb6aa1f
5 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,6 +131,11 @@ describe('enhanceDataFrame', () => {
name: 'trace2',
datasourceUid: 'uid',
},
{
matcherRegex: 'trace2=(\\w+)',
name: 'trace2',
datasourceUid: 'uid2',
},
],
});
expect(df.fields.length).toBe(3);
@@ -142,9 +147,14 @@ describe('enhanceDataFrame', () => {
});
expect(fc.getFieldByName('trace2').values.toArray()).toEqual([null, null, 'foo']);
expect(fc.getFieldByName('trace2').config.links.length).toBe(2);
expect(fc.getFieldByName('trace2').config.links[0]).toEqual({
title: '',
meta: { datasourceUid: 'uid' },
});
expect(fc.getFieldByName('trace2').config.links[1]).toEqual({
title: '',
meta: { datasourceUid: 'uid2' },
});
});
});