diff options
| author | George Moschovitis <george.moschovitis@gmail.com> | 2018-12-11 10:29:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 10:29:16 +0200 |
| commit | fe70512347fabdf662d69ba19796eb2457d22a9d (patch) | |
| tree | 918c61979adef09d5b889de8e797f8131183b399 /web | |
| parent | f16827d145d87e9273fe6312860b97ed8b70698a (diff) | |
Introduced IEC-compliant unit abbreviations #4711 (#4912)
* Introduced IEC-compliant unit abbreviations #4711
* Generated dashboard.js
* Reverted the old abbreviations to a x1000 coefficient
* Reverted coefficients
Diffstat (limited to 'web')
| -rw-r--r-- | web/gui/dashboard.js | 41 | ||||
| -rw-r--r-- | web/gui/src/dashboard.js/units-conversion.js | 41 |
2 files changed, 72 insertions, 10 deletions
diff --git a/web/gui/dashboard.js b/web/gui/dashboard.js index 9bafe3e490..d2f727c6f5 100644 --- a/web/gui/dashboard.js +++ b/web/gui/dashboard.js @@ -806,13 +806,20 @@ NETDATA.unitsConversion = { 'GB/s': 1024 * 1024, 'TB/s': 1024 * 1024 * 1024 }, + 'KiB/s': { + 'B/s': 1 / 1024, + 'KiB/s': 1, + 'MiB/s': 1024, + 'GiB/s': 1024 * 1024, + 'TiB/s': 1024 * 1024 * 1024 + }, 'B': { 'B': 1, - 'KB': 1024, - 'MB': 1024 * 1024, - 'GB': 1024 * 1024 * 1024, - 'TB': 1024 * 1024 * 1024 * 1024, - 'PB': 1024 * 1024 * 1024 * 1024 * 1024 + 'KiB': 1024, + 'MiB': 1024 * 1024, + 'GiB': 1024 * 1024 * 1024, + 'TiB': 1024 * 1024 * 1024 * 1024, + 'PiB': 1024 * 1024 * 1024 * 1024 * 1024 }, 'KB': { 'B': 1 / 1024, @@ -821,6 +828,13 @@ NETDATA.unitsConversion = { 'GB': 1024 * 1024, 'TB': 1024 * 1024 * 1024 }, + 'KiB': { + 'B': 1 / 1024, + 'KiB': 1, + 'MiB': 1024, + 'GiB': 1024 * 1024, + 'TiB': 1024 * 1024 * 1024 + }, 'MB': { 'B': 1 / (1024 * 1024), 'KB': 1 / 1024, @@ -829,6 +843,14 @@ NETDATA.unitsConversion = { 'TB': 1024 * 1024, 'PB': 1024 * 1024 * 1024 }, + 'MiB': { + 'B': 1 / (1024 * 1024), + 'KiB': 1 / 1024, + 'MiB': 1, + 'GiB': 1024, + 'TiB': 1024 * 1024, + 'PiB': 1024 * 1024 * 1024 + }, 'GB': { 'B': 1 / (1024 * 1024 * 1024), 'KB': 1 / (1024 * 1024), @@ -837,6 +859,15 @@ NETDATA.unitsConversion = { 'TB': 1024, 'PB': 1024 * 1024, 'EB': 1024 * 1024 * 1024 + }, + 'GiB': { + 'B': 1 / (1024 * 1024 * 1024), + 'KiB': 1 / (1024 * 1024), + 'MiB': 1 / 1024, + 'GiB': 1, + 'TiB': 1024, + 'PiB': 1024 * 1024, + 'EiB': 1024 * 1024 * 1024 } /* 'milliseconds': { diff --git a/web/gui/src/dashboard.js/units-conversion.js b/web/gui/src/dashboard.js/units-conversion.js index 9da3dccd42..26b8403446 100644 --- a/web/gui/src/dashboard.js/units-conversion.js +++ b/web/gui/src/dashboard.js/units-conversion.js @@ -39,13 +39,20 @@ NETDATA.unitsConversion = { 'GB/s': 1024 * 1024, 'TB/s': 1024 * 1024 * 1024 }, + 'KiB/s': { + 'B/s': 1 / 1024, + 'KiB/s': 1, + 'MiB/s': 1024, + 'GiB/s': 1024 * 1024, + 'TiB/s': 1024 * 1024 * 1024 + }, 'B': { 'B': 1, - 'KB': 1024, - 'MB': 1024 * 1024, - 'GB': 1024 * 1024 * 1024, - 'TB': 1024 * 1024 * 1024 * 1024, - 'PB': 1024 * 1024 * 1024 * 1024 * 1024 + 'KiB': 1024, + 'MiB': 1024 * 1024, + 'GiB': 1024 * 1024 * 1024, + 'TiB': 1024 * 1024 * 1024 * 1024, + 'PiB': 1024 * 1024 * 1024 * 1024 * 1024 }, 'KB': { 'B': 1 / 1024, @@ -54,6 +61,13 @@ NETDATA.unitsConversion = { 'GB': 1024 * 1024, 'TB': 1024 * 1024 * 1024 }, + 'KiB': { + 'B': 1 / 1024, + 'KiB': 1, + 'MiB': 1024, + 'GiB': 1024 * 1024, + 'TiB': 1024 * 1024 * 1024 + }, 'MB': { 'B': 1 / (1024 * 1024), 'KB': 1 / 1024, @@ -62,6 +76,14 @@ NETDATA.unitsConversion = { 'TB': 1024 * 1024, 'PB': 1024 * 1024 * 1024 }, + 'MiB': { + 'B': 1 / (1024 * 1024), + 'KiB': 1 / 1024, + 'MiB': 1, + 'GiB': 1024, + 'TiB': 1024 * 1024, + 'PiB': 1024 * 1024 * 1024 + }, 'GB': { 'B': 1 / (1024 * 1024 * 1024), 'KB': 1 / (1024 * 1024), @@ -70,6 +92,15 @@ NETDATA.unitsConversion = { 'TB': 1024, 'PB': 1024 * 1024, 'EB': 1024 * 1024 * 1024 + }, + 'GiB': { + 'B': 1 / (1024 * 1024 * 1024), + 'KiB': 1 / (1024 * 1024), + 'MiB': 1 / 1024, + 'GiB': 1, + 'TiB': 1024, + 'PiB': 1024 * 1024, + 'EiB': 1024 * 1024 * 1024 } /* 'milliseconds': { |