root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 82 Packages Projects Releases Wiki Activity

feat(graph): refactorings

This commit is contained in:
Torkel Ödegaard 2016-09-27 14:47:04 +02:00
parent 34f15d92d0
commit ade8aa5b92
4 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/models.go
View File

@ -56,8 +56,8 @@ type QueryResult struct {
} }
type TimeSeries struct { type TimeSeries struct {
Name string `json:"name"` Name string `json:"target"`
Points [][2]*float64 `json:"points"` Points [][2]*float64 `json:"datapoints"`
} }
type TimeSeriesSlice []*TimeSeries type TimeSeriesSlice []*TimeSeries

6
public/app/plugins/app/testdata/datasource/datasource.ts vendored
View File

@ -22,12 +22,6 @@ class TestDataDatasource {
scenario: options.targets[0].scenario, scenario: options.targets[0].scenario,
interval: options.intervalMs, interval: options.intervalMs,
maxDataPoints: options.maxDataPoints, maxDataPoints: options.maxDataPoints,
}).then(res => {
res.data = res.data.map(item => {
return {target: item.name, datapoints: item.points};
});
return res;
}); });
} }

2
public/app/plugins/datasource/grafana/datasource.ts
View File

@ -9,6 +9,8 @@ class GrafanaDatasource {
return this.backendSrv.get('/api/metrics/test', { return this.backendSrv.get('/api/metrics/test', {
from: options.range.from.valueOf(), from: options.range.from.valueOf(),
to: options.range.to.valueOf(), to: options.range.to.valueOf(),
scenario: 'random_walk',
interval: options.intervalMs,
maxDataPoints: options.maxDataPoints maxDataPoints: options.maxDataPoints
}); });
} }

52
public/app/plugins/panel/graph/data_processor.ts
View File

@ -98,65 +98,13 @@ export class DataProcessor {
} }
customHandler(dataItem) { customHandler(dataItem) {
console.log('custom', dataItem);
let nameField = this.panel.xaxis.name; let nameField = this.panel.xaxis.name;
if (!nameField) { if (!nameField) {
throw {message: 'No field name specified to use for x-axis, check your axes settings'}; throw {message: 'No field name specified to use for x-axis, check your axes settings'};
} }
// let valueField = this.panel.xaxis.esValueField;
// let datapoints = _.map(seriesData.datapoints, (doc) => {
// return [
// pluckDeep(doc, valueField), // Y value
// pluckDeep(doc, xField) // X value
// ];
// });
//
// // Remove empty points
// datapoints = _.filter(datapoints, (point) => {
// return point[0] !== undefined;
// });
//
// var alias = valueField;
// re
return []; return [];
} }
// tableHandler(seriesData, index) {
// var xColumnIndex = Number(this.panel.xaxis.columnIndex);
// var valueColumnIndex = Number(this.panel.xaxis.valueColumnIndex);
// var datapoints = _.map(seriesData.rows, (row) => {
// var value = valueColumnIndex ? row[valueColumnIndex] : _.last(row);
// return [
// value, // Y value
// row[xColumnIndex] // X value
// ];
// });
//
// var alias = seriesData.columns[valueColumnIndex].text;
//
// return this.seriesHandler(seriesData, index, datapoints, alias);
// }
// esRawDocHandler(seriesData, index) {
// let xField = this.panel.xaxis.esField;
// let valueField = this.panel.xaxis.esValueField;
// let datapoints = _.map(seriesData.datapoints, (doc) => {
// return [
// pluckDeep(doc, valueField), // Y value
// pluckDeep(doc, xField) // X value
// ];
// });
//
// // Remove empty points
// datapoints = _.filter(datapoints, (point) => {
// return point[0] !== undefined;
// });
//
// var alias = valueField;
// return this.seriesHandler(seriesData, index, datapoints, alias);
// }
validateXAxisSeriesValue() { validateXAxisSeriesValue() {
switch (this.panel.xaxis.mode) { switch (this.panel.xaxis.mode) {
case 'series': { case 'series': {