RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-02-04 14:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #600 from prometheus/fix-special-graph-values

Browse Source 
More fixes around special values in graphs.
This commit is contained in:
Julius Volz 2015-03-19 16:55:54 +01:00
commit 3c473c635b
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/static/js/graph.js
View File

@ -384,16 +384,17 @@ Prometheus.Graph.prototype.metricToTsName = function(labels) {
};
Prometheus.Graph.prototype.parseValue = function(value) {
if (value == "NaN" || value == "Inf" || value == "-Inf") {
// Can't display these values on a graph, so display a gap instead.
return null;
} else {
return parseFloat(value);
var val = parseFloat(value);
if (isNaN(val)) {
// "+Inf", "-Inf", "+Inf" will be parsed into NaN by parseFloat(). The
// can't be graphed, so show them as gaps (null).
return null
}
return val;
};
Prometheus.Graph.prototype.transformData = function(json) {
self = this;
var self = this;
var palette = new Rickshaw.Color.Palette();
if (json.type != "matrix") {
self.showError("Result is not of matrix type! Please enter a correct expression.");

12
web/static/js/prom_console.js
View File

@ -377,15 +377,17 @@ PromConsole.Graph = function(params) {
};
PromConsole.Graph.prototype._parseValue = function(value) {
if (value == "NaN" || value == "Inf" || value == "-Inf") {
// Can't display these values on a graph, so display a gap instead.
return null;
} else {
return parseFloat(value);
var val = parseFloat(value);
if (isNaN(val)) {
// "+Inf", "-Inf", "+Inf" will be parsed into NaN by parseFloat(). The
// can't be graphed, so show them as gaps (null).
return null
}
return val;
}
PromConsole.Graph.prototype._render = function(data) {
var self = this;
var palette = new Rickshaw.Color.Palette();
var series = [];