fix: fixed slow down issue in table panel by removing the fillter null values feature (#7602), not sure the filter null values is a good table option, should be done in metric query, fixes #8234

This commit is contained in:
Torkel Ödegaard 2017-05-09 12:07:06 +02:00
parent 84141eb14a
commit e218052a90
3 changed files with 2 additions and 15 deletions

View File

@ -21,10 +21,6 @@
<metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment> <metric-segment segment="editor.addColumnSegment" get-options="editor.getColumnOptions()" on-change="editor.addColumn()"></metric-segment>
</div> </div>
</div> </div>
<gf-form-switch class="gf-form" label-class="width-10"
label="Filter null values"
checked="editor.panel.filterNull"
on-change="editor.render()"></gf-form-switch>
</div> </div>
<div class="section gf-form-group"> <div class="section gf-form-group">

View File

@ -45,7 +45,6 @@ class TablePanelCtrl extends MetricsPanelCtrl {
scroll: true, scroll: true,
fontSize: '100%', fontSize: '100%',
sort: {col: 0, desc: true}, sort: {col: 0, desc: true},
filterNull: false,
}; };
/** @ngInject */ /** @ngInject */

View File

@ -220,8 +220,7 @@ transformers['json'] = {
}; };
function transformDataToTable(data, panel) { function transformDataToTable(data, panel) {
var model = new TableModel(), var model = new TableModel();
copyData = angular.copy(data);
if (!data || data.length === 0) { if (!data || data.length === 0) {
return model; return model;
@ -232,14 +231,7 @@ function transformDataToTable(data, panel) {
throw {message: 'Transformer ' + panel.transform + ' not found'}; throw {message: 'Transformer ' + panel.transform + ' not found'};
} }
if (panel.filterNull) { transformer.transform(data, panel, model);
for (var i = 0; i < copyData.length; i++) {
copyData[i].datapoints = copyData[i].datapoints.filter((dp) => dp[0] != null);
}
}
transformer.transform(copyData, panel, model);
return model; return model;
} }