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

Explore: Add join transform for timeseries shown in table (#25906)

Browse Source 
* Add join transform if showing timeseries only in the table

* Fix typo
This commit is contained in:
Andrej Ocenas 2020-06-29 23:20:57 +02:00 committed by GitHub
parent d243cd9421
commit ee5b8b3fec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/app/features/explore/utils/ResultProcessor.test.ts
View File

@ -155,6 +155,38 @@ describe('ResultProcessor', () => {
expect(theResult.fields[1].display).not.toBeNull();
expect(theResult.length).toBe(3);
});
it('should do join transform if all series are timeseries', () => {
const { resultProcessor } = testContext({
dataFrames: [
toDataFrame({
name: 'A-series',
refId: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [100, 200, 300] },
{ name: 'A-series', type: FieldType.number, values: [4, 5, 6] },
],
}),
toDataFrame({
name: 'B-series',
refId: 'B',
fields: [
{ name: 'Time', type: FieldType.time, values: [100, 200, 300] },
{ name: 'B-series', type: FieldType.number, values: [4, 5, 6] },
],
}),
],
});
let result = resultProcessor.getTableResult()!;
expect(result.fields[0].name).toBe('Time');
expect(result.fields[1].name).toBe('A-series');
expect(result.fields[2].name).toBe('B-series');
expect(result.fields[0].values.toArray()).toEqual([100, 200, 300]);
expect(result.fields[1].values.toArray()).toEqual([4, 5, 6]);
expect(result.fields[2].values.toArray()).toEqual([4, 5, 6]);
});
});
describe('when calling getLogsResult', () => {

12
public/app/features/explore/utils/ResultProcessor.ts
View File

@ -68,8 +68,16 @@ export class ResultProcessor {
return null;
}
const mergeTransformer = standardTransformers.mergeTransformer.transformer({});
const data = mergeTransformer(onlyTables)[0];
const hasOnlyTimeseries = onlyTables.every(df => isTimeSeries(df));
// If we have only timeseries we do join on default time column which makes more sense. If we are showing
// non timeseries or some mix of data we are not trying to join on anything and just try to merge them in
// single table, which may not make sense in most cases, but it's up to the user to query something sensible.
const transformer = hasOnlyTimeseries
? standardTransformers.seriesToColumnsTransformer.transformer({})
: standardTransformers.mergeTransformer.transformer({});
const data = transformer(onlyTables)[0];
// set display processor
for (const field of data.fields) {