1 files changed, 11 insertions, 3 deletions
diff --git a/glances/outputs/static/js/services/plugins/glances_diskio.js b/glances/outputs/static/js/services/plugins/glances_diskio.js
index 2ba1a396..42306e5a 100644
--- a/glances/outputs/static/js/services/plugins/glances_diskio.js
+++ b/glances/outputs/static/js/services/plugins/glances_diskio.js
@@ -1,18 +1,26 @@
-glancesApp.service('GlancesPluginDiskio', function() {
+glancesApp.service('GlancesPluginDiskio', function($filter) {
     var _pluginName = "diskio";
     this.disks = [];
 
     this.setData = function(data, views) {
         data = data[_pluginName];
+        data = $filter('orderBy')(data,'disk_name');
         this.disks = [];
 
         for (var i = 0; i < data.length; i++) {
             var diskioData = data[i];
+            var timeSinceUpdate = diskioData['time_since_update'];
 
             var diskio = {
                 'name': diskioData['disk_name'],
-                'readBytes': diskioData['read_bytes'],
-                'writeBytes': diskioData['write_bytes']
+                'bitrate': {
+                  'txps': $filter('bytes')(diskioData['read_bytes'] / timeSinceUpdate),
+                  'rxps': $filter('bytes')(diskioData['write_bytes'] / timeSinceUpdate)
+                },
+                'count': {
+                  'txps': $filter('bytes')(diskioData['read_count'] / timeSinceUpdate),
+                  'rxps': $filter('bytes')(diskioData['write_count'] / timeSinceUpdate)
+                }
             };
 
             this.disks.push(diskio);