IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mayli/grafana into mayli-master

Browse Source 
* 'master' of https://github.com/mayli/grafana:
  Use B/s instead Bps for Bytes per second
This commit is contained in:
bergquist
2018-03-08 18:50:02 +01:00
parent c80d346417 675e5ae17f
commit 0ee6a5216b
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/utils/kbn.ts
+15 -15
View File
@@ -455,7 +455,7 @@ kbn.valueFormats.decgbytes = kbn.formatBuilders.decimalSIPrefix('B', 3);
// Data Rate // Data Rate
kbn.valueFormats.pps = kbn.formatBuilders.decimalSIPrefix('pps'); kbn.valueFormats.pps = kbn.formatBuilders.decimalSIPrefix('pps');
kbn.valueFormats.bps = kbn.formatBuilders.decimalSIPrefix('bps'); kbn.valueFormats.bps = kbn.formatBuilders.decimalSIPrefix('bps');
kbn.valueFormats.Bps = kbn.formatBuilders.decimalSIPrefix('Bps'); kbn.valueFormats.Bps = kbn.formatBuilders.decimalSIPrefix('B/s');
kbn.valueFormats.KBs = kbn.formatBuilders.decimalSIPrefix('Bs', 1); kbn.valueFormats.KBs = kbn.formatBuilders.decimalSIPrefix('Bs', 1);
kbn.valueFormats.Kbits = kbn.formatBuilders.decimalSIPrefix('bps', 1); kbn.valueFormats.Kbits = kbn.formatBuilders.decimalSIPrefix('bps', 1);
kbn.valueFormats.MBs = kbn.formatBuilders.decimalSIPrefix('Bs', 2); kbn.valueFormats.MBs = kbn.formatBuilders.decimalSIPrefix('Bs', 2);
@@ -464,13 +464,13 @@ kbn.valueFormats.GBs = kbn.formatBuilders.decimalSIPrefix('Bs', 3);
kbn.valueFormats.Gbits = kbn.formatBuilders.decimalSIPrefix('bps', 3); kbn.valueFormats.Gbits = kbn.formatBuilders.decimalSIPrefix('bps', 3);
// Hash Rate // Hash Rate
kbn.valueFormats.Hs = kbn.formatBuilders.decimalSIPrefix('H/s'); kbn.valueFormats.Hs = kbn.formatBuilders.decimalSIPrefix('H/s');
kbn.valueFormats.KHs = kbn.formatBuilders.decimalSIPrefix('H/s', 1); kbn.valueFormats.KHs = kbn.formatBuilders.decimalSIPrefix('H/s', 1);
kbn.valueFormats.MHs = kbn.formatBuilders.decimalSIPrefix('H/s', 2); kbn.valueFormats.MHs = kbn.formatBuilders.decimalSIPrefix('H/s', 2);
kbn.valueFormats.GHs = kbn.formatBuilders.decimalSIPrefix('H/s', 3); kbn.valueFormats.GHs = kbn.formatBuilders.decimalSIPrefix('H/s', 3);
kbn.valueFormats.THs = kbn.formatBuilders.decimalSIPrefix('H/s', 4); kbn.valueFormats.THs = kbn.formatBuilders.decimalSIPrefix('H/s', 4);
kbn.valueFormats.PHs = kbn.formatBuilders.decimalSIPrefix('H/s', 5); kbn.valueFormats.PHs = kbn.formatBuilders.decimalSIPrefix('H/s', 5);
kbn.valueFormats.EHs = kbn.formatBuilders.decimalSIPrefix('H/s', 6); kbn.valueFormats.EHs = kbn.formatBuilders.decimalSIPrefix('H/s', 6);
// Throughput // Throughput
kbn.valueFormats.ops = kbn.formatBuilders.simpleCountUnit('ops'); kbn.valueFormats.ops = kbn.formatBuilders.simpleCountUnit('ops');
@@ -901,13 +901,13 @@ kbn.getUnitFormats = function() {
{ {
text: 'hash rate', text: 'hash rate',
submenu: [ submenu: [
{text: 'hashes/sec', value: 'Hs'}, { text: 'hashes/sec', value: 'Hs' },
{text: 'kilohashes/sec', value: 'KHs'}, { text: 'kilohashes/sec', value: 'KHs' },
{text: 'megahashes/sec', value: 'MHs'}, { text: 'megahashes/sec', value: 'MHs' },
{text: 'gigahashes/sec', value: 'GHs'}, { text: 'gigahashes/sec', value: 'GHs' },
{text: 'terahashes/sec', value: 'THs'}, { text: 'terahashes/sec', value: 'THs' },
{text: 'petahashes/sec', value: 'PHs'}, { text: 'petahashes/sec', value: 'PHs' },
{text: 'exahashes/sec', value: 'EHs'}, { text: 'exahashes/sec', value: 'EHs' },
], ],
}, },
{ {