mirror of
https://github.com/grafana/grafana.git
synced 2024-11-29 20:24:18 -06:00
don't use process timeseries
This commit is contained in:
parent
0f0f76b602
commit
65476d4044
@ -20,27 +20,10 @@ export interface TimeSeriesVM {
|
||||
label: string;
|
||||
color: string;
|
||||
data: TimeSeriesValue[][];
|
||||
stats: TimeSeriesStats;
|
||||
allIsNull: boolean;
|
||||
allIsZero: boolean;
|
||||
}
|
||||
|
||||
export interface TimeSeriesStats {
|
||||
[key: string]: number | null;
|
||||
total: number | null;
|
||||
max: number | null;
|
||||
min: number | null;
|
||||
logmin: number;
|
||||
avg: number | null;
|
||||
current: number | null;
|
||||
first: number | null;
|
||||
delta: number;
|
||||
diff: number | null;
|
||||
range: number | null;
|
||||
timeStep: number;
|
||||
count: number;
|
||||
}
|
||||
|
||||
export enum NullValueMode {
|
||||
Null = 'null',
|
||||
Ignore = 'connected',
|
||||
|
@ -2,17 +2,9 @@
|
||||
import _ from 'lodash';
|
||||
import React, { PureComponent } from 'react';
|
||||
|
||||
import {
|
||||
Graph,
|
||||
PanelProps,
|
||||
NullValueMode,
|
||||
colors,
|
||||
TimeSeriesVMs,
|
||||
ColumnType,
|
||||
getFirstTimeColumn,
|
||||
processTimeSeries,
|
||||
} from '@grafana/ui';
|
||||
import { Graph, PanelProps, NullValueMode, colors, TimeSeriesVMs, ColumnType, getFirstTimeColumn } from '@grafana/ui';
|
||||
import { Options } from './types';
|
||||
import { getFlotPairs } from '@grafana/ui/src/utils/flotPairs';
|
||||
|
||||
interface Props extends PanelProps<Options> {}
|
||||
|
||||
@ -33,16 +25,23 @@ export class GraphPanel extends PureComponent<Props> {
|
||||
|
||||
// Show all numeric columns
|
||||
if (column.type === ColumnType.number) {
|
||||
const tsvm = processTimeSeries({
|
||||
data: [table],
|
||||
xColumn: timeColumn,
|
||||
yColumn: i,
|
||||
// Use external calculator just to make sure it works :)
|
||||
const points = getFlotPairs({
|
||||
rows: table.rows,
|
||||
xIndex: timeColumn,
|
||||
yIndex: i,
|
||||
nullValueMode: NullValueMode.Null,
|
||||
})[0];
|
||||
});
|
||||
|
||||
const colorIndex = vmSeries.length % colors.length;
|
||||
tsvm.color = colors[colorIndex];
|
||||
vmSeries.push(tsvm);
|
||||
vmSeries.push({
|
||||
label: column.text,
|
||||
data: points,
|
||||
color: colors[vmSeries.length % colors.length],
|
||||
|
||||
// TODO (calculate somewhere)
|
||||
allIsNull: false,
|
||||
allIsZero: false,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ export class PieChartPanel extends PureComponent<Props> {
|
||||
const serie = vmSeries[i];
|
||||
if (serie) {
|
||||
datapoints.push({
|
||||
value: serie.stats[valueOptions.stat],
|
||||
value: 7, // serie.stats[valueOptions.stat],
|
||||
name: serie.label,
|
||||
color: serie.color,
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user