Commit a49ef90a by Daniel Lee

singlestat: value mapping for table data

Adds support for value mapping for table data in the single stat panel.
parent 8874be4c
...@@ -178,6 +178,8 @@ class SingleStatCtrl extends MetricsPanelCtrl { ...@@ -178,6 +178,8 @@ class SingleStatCtrl extends MetricsPanelCtrl {
var formatFunc = kbn.valueFormats[this.panel.format]; var formatFunc = kbn.valueFormats[this.panel.format];
data.valueFormatted = formatFunc(datapoint[this.panel.tableColumn], decimalInfo.decimals, decimalInfo.scaledDecimals); data.valueFormatted = formatFunc(datapoint[this.panel.tableColumn], decimalInfo.decimals, decimalInfo.scaledDecimals);
data.valueRounded = kbn.roundValue(data.value, this.panel.decimals || 0); data.valueRounded = kbn.roundValue(data.value, this.panel.decimals || 0);
this.setValueMapping(data);
} }
setColoring(options) { setColoring(options) {
...@@ -274,7 +276,10 @@ class SingleStatCtrl extends MetricsPanelCtrl { ...@@ -274,7 +276,10 @@ class SingleStatCtrl extends MetricsPanelCtrl {
data.scopedVars = _.extend({}, this.panel.scopedVars); data.scopedVars = _.extend({}, this.panel.scopedVars);
data.scopedVars["__name"] = {value: this.series[0].label}; data.scopedVars["__name"] = {value: this.series[0].label};
} }
this.setValueMapping(data);
}
setValueMapping(data) {
// check value to text mappings if its enabled // check value to text mappings if its enabled
if (this.panel.mappingType === 1) { if (this.panel.mappingType === 1) {
for (let i = 0; i < this.panel.valueMaps.length; i++) { for (let i = 0; i < this.panel.valueMaps.length; i++) {
......
...@@ -136,40 +136,27 @@ describe('SingleStatCtrl', function() { ...@@ -136,40 +136,27 @@ describe('SingleStatCtrl', function() {
}); });
}); });
describe('When table data', function() {
const tableData = [{ const tableData = [{
"columns": [ "columns": [
{ { "text": "Time", "type": "time" },
"text": "Time", { "text": "test1" },
"type": "time" { "text": "mean" },
}, { "text": "test2" }
{
"text": "test1"
},
{
"text": "mean"
},
{
"text": "test2"
}
], ],
"rows": [ "rows": [
[ [1492759673649, 'ignore1', 15, 'ignore2']
1492759673649,
'ignore1',
15,
'ignore2'
]
], ],
"type": "table" "type": "table"
}]; }];
singleStatScenario('When table data', function(ctx) { singleStatScenario('with default values', function(ctx) {
ctx.setup(function() { ctx.setup(function() {
ctx.data = tableData; ctx.data = tableData;
ctx.ctrl.panel.tableColumn = 'mean'; ctx.ctrl.panel.tableColumn = 'mean';
}); });
it('Should use series avg as default main value', function() { it('Should use first rows value as default main value', function() {
expect(ctx.data.value).to.be(15); expect(ctx.data.value).to.be(15);
expect(ctx.data.valueRounded).to.be(15); expect(ctx.data.valueRounded).to.be(15);
}); });
...@@ -190,6 +177,72 @@ describe('SingleStatCtrl', function() { ...@@ -190,6 +177,72 @@ describe('SingleStatCtrl', function() {
}); });
}); });
singleStatScenario('MainValue should use same number for decimals as displayed when checking thresholds', function(ctx) {
ctx.setup(function() {
ctx.data = tableData;
ctx.data[0].rows[0] = [1492759673649,'ignore1', 99.99999, 'ignore2'];
ctx.ctrl.panel.tableColumn = 'mean';
});
it('Should be rounded', function() {
expect(ctx.data.value).to.be(99.99999);
expect(ctx.data.valueRounded).to.be(100);
});
it('should set formatted falue', function() {
expect(ctx.data.valueFormatted).to.be('100');
});
});
singleStatScenario('When value to text mapping is specified', function(ctx) {
ctx.setup(function() {
ctx.data = tableData;
ctx.data[0].rows[0] = [1492759673649,'ignore1', 9.9, 'ignore2'];
ctx.ctrl.panel.tableColumn = 'mean';
ctx.ctrl.panel.valueMaps = [{value: '10', text: 'OK'}];
});
it('value should remain', function() {
expect(ctx.data.value).to.be(9.9);
});
it('round should be rounded up', function() {
expect(ctx.data.valueRounded).to.be(10);
});
it('Should replace value with text', function() {
expect(ctx.data.valueFormatted).to.be('OK');
});
});
singleStatScenario('When range to text mapping is specified for first range', function(ctx) {
ctx.setup(function() {
ctx.data = tableData;
ctx.data[0].rows[0] = [1492759673649,'ignore1', 41, 'ignore2'];
ctx.ctrl.panel.tableColumn = 'mean';
ctx.ctrl.panel.mappingType = 2;
ctx.ctrl.panel.rangeMaps = [{from: '10', to: '50', text: 'OK'},{from: '51', to: '100', text: 'NOT OK'}];
});
it('Should replace value with text OK', function() {
expect(ctx.data.valueFormatted).to.be('OK');
});
});
singleStatScenario('When range to text mapping is specified for other ranges', function(ctx) {
ctx.setup(function() {
ctx.data = tableData;
ctx.data[0].rows[0] = [1492759673649,'ignore1', 65, 'ignore2'];
ctx.ctrl.panel.tableColumn = 'mean';
ctx.ctrl.panel.mappingType = 2;
ctx.ctrl.panel.rangeMaps = [{from: '10', to: '50', text: 'OK'},{from: '51', to: '100', text: 'NOT OK'}];
});
it('Should replace value with text NOT OK', function() {
expect(ctx.data.valueFormatted).to.be('NOT OK');
});
});
});
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment