RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Fix hover when metric has null value. (#4906) 

When a metric has a null value, number formatters like
`humanizeNoSmallPrefix` will throw "Uncaught TypeError: Cannot read
property 'toPrecision' of null".

This is fixed by explicitly checking for `null` and returning the string
"null".

Note: This is usually not seen as rickshaw doesn't show annotations for
null values, but still calls the formatter.

Signed-off-by: David Coles <coles.david@gmail.com>
This commit is contained in:
David Coles 2018-11-24 22:16:48 -08:00 committed by Julius Volz
parent 080e6ed31a
commit 1591ebf985
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ui/assets_vfsdata.go
View File

File diff suppressed because one or more lines are too long

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

@ -21,6 +21,9 @@ PromConsole._stripTrailingZero = function(x) {
// Humanize a number.
PromConsole.NumberFormatter.humanize = function(x) {
if (x === null) {
return "null";
}
var ret = PromConsole.NumberFormatter._humanize(
x, PromConsole.NumberFormatter.prefixesBig,
PromConsole.NumberFormatter.prefixesSmall, 1000);
@ -34,6 +37,9 @@ PromConsole.NumberFormatter.humanize = function(x) {
// Humanize a number, don't use milli/micro/etc. prefixes.
PromConsole.NumberFormatter.humanizeNoSmallPrefix = function(x) {
if (x === null) {
return "null";
}
if (Math.abs(x) < 1) {
return PromConsole._stripTrailingZero(x.toPrecision(3));
}
@ -47,6 +53,9 @@ PromConsole.NumberFormatter.humanizeNoSmallPrefix = function(x) {
// Humanize a number with 1024 as the base, rather than 1000.
PromConsole.NumberFormatter.humanize1024 = function(x) {
if (x === null) {
return "null";
}
var ret = PromConsole.NumberFormatter._humanize(
x, PromConsole.NumberFormatter.prefixesBig1024,
[], 1024);
@ -60,6 +69,9 @@ PromConsole.NumberFormatter.humanize1024 = function(x) {
// Humanize a number, returning an exact representation.
PromConsole.NumberFormatter.humanizeExact = function(x) {
if (x === null) {
return "null";
}
var ret = PromConsole.NumberFormatter._humanize(
x, PromConsole.NumberFormatter.prefixesBig,
PromConsole.NumberFormatter.prefixesSmall, 1000);