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

fix(graph): fixed issue with old threshold to new threshold model migration, fixes #6236

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-10-11 13:22:46 +02:00
parent f1905a8485
commit 73fc659011
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/dashboard/dashboard_srv.ts
View File

@@ -514,9 +514,11 @@ export class DashboardModel {
if (panel.grid.thresholdLine) {
t1.line = true;
t1.lineColor = panel.grid.threshold1Color;
t1.colorMode = 'custom';
} else {
t1.fill = true;
t1.fillColor = panel.grid.threshold1Color;
t1.colorMode = 'custom';
}
}
@@ -525,25 +527,27 @@ export class DashboardModel {
if (panel.grid.thresholdLine) {
t2.line = true;
t2.lineColor = panel.grid.threshold2Color;
t2.colorMode = 'custom';
} else {
t2.fill = true;
t2.fillColor = panel.grid.threshold2Color;
t2.colorMode = 'custom';
}
}
if (_.isNumber(t1.value)) {
if (_.isNumber(t2.value)) {
if (t1.value > t2.value) {
t1.op = t2.op = '<';
panel.thresholds.push(t2);
t1.op = t2.op = 'lt';
panel.thresholds.push(t1);
panel.thresholds.push(t2);
} else {
t1.op = t2.op = '>';
panel.thresholds.push(t2);
t1.op = t2.op = 'gt';
panel.thresholds.push(t1);
panel.thresholds.push(t2);
}
} else {
t1.op = '>';
t1.op = 'gt';
panel.thresholds.push(t1);
}
}

10
public/app/features/dashboard/specs/dashboard_srv_specs.ts
View File

@@ -221,11 +221,11 @@ describe('dashboardSrv', function() {
it('graph thresholds should be migrated', function() {
expect(graph.thresholds.length).to.be(2);
expect(graph.thresholds[0].op).to.be('>');
expect(graph.thresholds[0].value).to.be(400);
expect(graph.thresholds[0].fillColor).to.be('red');
expect(graph.thresholds[1].value).to.be(200);
expect(graph.thresholds[1].fillColor).to.be('yellow');
expect(graph.thresholds[0].op).to.be('gt');
expect(graph.thresholds[0].value).to.be(200);
expect(graph.thresholds[0].fillColor).to.be('yellow');
expect(graph.thresholds[1].value).to.be(400);
expect(graph.thresholds[1].fillColor).to.be('red');
});
});