From 22c3ec2d638e94c985e40bff3aea6e8515f7841b Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Thu, 5 Nov 2015 22:57:05 -0800
Subject: [PATCH] Made the units more readable

---
 public/app/components/kbn.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/public/app/components/kbn.js b/public/app/components/kbn.js
index 825df91ff3c..34d943ed028 100644
--- a/public/app/components/kbn.js
+++ b/public/app/components/kbn.js
@@ -310,6 +310,16 @@ function($, _) {
     };
   };
 
+  kbn.formatBuilders.simpleCountUnit = function(symbol) {
+    var units = ['', 'K', 'M', 'B', 'T'];
+    var scaler = kbn.formatBuilders.scaledUnits(1000, units);
+    return function(size, decimals, scaledDecimals) {
+      if (size === null) { return ""; }
+      var scaled = scaler(size, decimals, scaledDecimals);
+      return scaled + " " + symbol;
+    };
+  };
+
   ///// VALUE FORMATS /////
 
   // Dimensionless Units
@@ -345,10 +355,10 @@ function($, _) {
   kbn.valueFormats.Bps = kbn.formatBuilders.decimalSIPrefix('Bps');
 
   // Throughput
-  kbn.valueFormats.ops  = kbn.formatBuilders.fixedUnit('ops');
-  kbn.valueFormats.rps  = kbn.formatBuilders.fixedUnit('rps');
-  kbn.valueFormats.wps  = kbn.formatBuilders.fixedUnit('wps');
-  kbn.valueFormats.iops = kbn.formatBuilders.fixedUnit('iops');
+  kbn.valueFormats.ops  = kbn.formatBuilders.simpleCountUnit('ops');
+  kbn.valueFormats.rps  = kbn.formatBuilders.simpleCountUnit('rps');
+  kbn.valueFormats.wps  = kbn.formatBuilders.simpleCountUnit('wps');
+  kbn.valueFormats.iops = kbn.formatBuilders.simpleCountUnit('iops');
 
   // Energy
   kbn.valueFormats.watt   = kbn.formatBuilders.decimalSIPrefix('W');