Merge pull request #2492 from rashidkpc/fix/number-precision

Configurable precision for numbers
elastic · Jan 3, 2015 · 6691a0b · 6691a0b
2 parents 74a117f + cc51704
commit 6691a0b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 15 deletions.
diff --git a/src/kibana/components/config/defaults.js b/src/kibana/components/config/defaults.js
@@ -27,6 +27,10 @@ define(function (require) {
       value: 10,
       description: 'The top N most popular fields to show',
     },
+    'format:numberPrecision': {
+      value: 3,
+      description: 'Round numbers to this many decimal places',
+    },
     'histogram:barTarget': {
       value: 50,
       description: 'Attempt to generate around this many bar when using "auto" interval in date histograms',

diff --git a/src/kibana/components/index_patterns/_field_formats.js b/src/kibana/components/index_patterns/_field_formats.js
@@ -33,6 +33,20 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
 
+    function stringConverter(val) {
+      return formatField(val, function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      });
+    }
+
     var formats = [
       {
         types: [
@@ -47,19 +61,7 @@ define(function (require) {
           'conflict'
         ],
         name: 'string',
-        convert: function (val) {
-          return formatField(val, function (val) {
-            if (_.isObject(val)) {
-              return JSON.stringify(val);
-            }
-            else if (val == null) {
-              return '';
-            }
-            else {
-              return '' + val;
-            }
-          });
-        }
+        convert: stringConverter
       },
       {
         types: [
@@ -95,7 +97,22 @@ define(function (require) {
         name: 'kilobytes',
         convert: function (val) {
           return formatField(val, function (val) {
-            return (val / 1024).toFixed(3) + ' kb';
+            return (val / 1024).toFixed(config.get('format:numberPrecision')) + ' kb';
+          });
+        }
+      },
+      {
+        types: [
+          'number'
+        ],
+        name: 'number',
+        convert: function (val) {
+          return formatField(val, function (val) {
+            if (_.isNumber(val)) {
+              return +val.toFixed(config.get('format:numberPrecision'));
+            } else {
+              return stringConverter(val);
+            }
           });
         }
       }
@@ -123,7 +140,7 @@ define(function (require) {
     formats.byName = _.indexBy(formats, 'name');
 
     formats.defaultByType = {
-      number:     formats.byName.string,
+      number:     formats.byName.number,
       date:       formats.byName.date,
       boolean:    formats.byName.string,
       ip:         formats.byName.ip,