diff --git a/glances/outputs/static/html/plugins/diskio.html b/glances/outputs/static/html/plugins/diskio.html index 4ec298bd..c638eb8a 100644 --- a/glances/outputs/static/html/plugins/diskio.html +++ b/glances/outputs/static/html/plugins/diskio.html @@ -6,11 +6,11 @@
IOR/s
IOW/s
-
+
{{disk.name | min_size}}
-
{{disk.bitrate.txps | bytes}}
-
{{disk.bitrate.rxps | bytes}}
+
{{disk.bitrate.txps }}
+
{{disk.bitrate.rxps }}
-
{{disk.count.txps | bytes}}
-
{{disk.count.rxps | bytes}}
+
{{disk.count.txps }}
+
{{disk.count.rxps }}
diff --git a/glances/outputs/static/js/services/plugins/glances_diskio.js b/glances/outputs/static/js/services/plugins/glances_diskio.js index 85889d40..42306e5a 100644 --- a/glances/outputs/static/js/services/plugins/glances_diskio.js +++ b/glances/outputs/static/js/services/plugins/glances_diskio.js @@ -1,9 +1,10 @@ -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++) { @@ -13,12 +14,12 @@ glancesApp.service('GlancesPluginDiskio', function() { var diskio = { 'name': diskioData['disk_name'], 'bitrate': { - 'txps': diskioData['read_bytes'] / timeSinceUpdate, - 'rxps': diskioData['write_bytes'] / timeSinceUpdate + 'txps': $filter('bytes')(diskioData['read_bytes'] / timeSinceUpdate), + 'rxps': $filter('bytes')(diskioData['write_bytes'] / timeSinceUpdate) }, 'count': { - 'txps': diskioData['read_count'] / timeSinceUpdate, - 'rxps': diskioData['write_count'] / timeSinceUpdate + 'txps': $filter('bytes')(diskioData['read_count'] / timeSinceUpdate), + 'rxps': $filter('bytes')(diskioData['write_count'] / timeSinceUpdate) } };