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

Updated is time series test

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-09-03 15:57:00 +02:00
parent 7cec383470
commit 289a33bf5b
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ export class ResultProcessor {
return []; return [];
} }
const onlyTimeSeries = this.dataFrames.filter(series => series.fields.length === 2); const onlyTimeSeries = this.dataFrames.filter(isTimeSeries);
return getGraphSeriesModel( return getGraphSeriesModel(
onlyTimeSeries, onlyTimeSeries,
@ -36,14 +36,7 @@ export class ResultProcessor {
// For now ignore time series // For now ignore time series
// We can change this later, just need to figure out how to // We can change this later, just need to figure out how to
// Ignore time series only for prometheus // Ignore time series only for prometheus
const onlyTables = this.dataFrames.filter(frame => { const onlyTables = this.dataFrames.filter(frame => !isTimeSeries(frame));
if (frame.fields.length === 2) {
if (frame.fields[1].type === FieldType.time) {
return false;
}
}
return true;
});
const tables = onlyTables.map(frame => { const tables = onlyTables.map(frame => {
const { fields } = frame; const { fields } = frame;
@ -113,3 +106,13 @@ export class ResultProcessor {
return { ...sortedNewResults, rows, series }; return { ...sortedNewResults, rows, series };
} }
} }
export function isTimeSeries(frame: DataFrame): boolean {
if (frame.fields.length === 2) {
if (frame.fields[1].type === FieldType.time) {
return true;
}
}
return false;
}