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

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-05-10 17:19:03 +02:00
parent 0a68dabb89 d6eefcb5ce
commit 1d4338ba54
5 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/panel/table/editor.ts
View File

@@ -53,6 +53,10 @@ export class TablePanelEditorCtrl {
transformChanged() {
this.panel.columns = [];
if (this.panel.transform === 'timeseries_aggregations') {
this.panel.columns.push({text: 'Avg', value: 'avg'});
}
this.render();
}

4
public/app/plugins/panel/table/transformers.ts
View File

@@ -89,10 +89,6 @@ transformers['timeseries_aggregations'] = {
var i, y;
model.columns.push({text: 'Metric'});
if (panel.columns.length === 0) {
panel.columns.push({text: 'Avg', value: 'avg'});
}
for (i = 0; i < panel.columns.length; i++) {
model.columns.push({text: panel.columns[i].text});
}