From a5e021a55984a057397ea827657e8a3c891ea030 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Thu, 7 Jan 2016 19:52:16 +0100 Subject: [PATCH 1/3] WebUI : Add IOps in the DiskIO plugin --- glances/outputs/static/html/plugins/diskio.html | 14 ++++++++++---- .../static/js/services/plugins/glances_diskio.js | 11 +++++++++-- glances/outputs/static/js/stats_controller.js | 7 ++++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/glances/outputs/static/html/plugins/diskio.html b/glances/outputs/static/html/plugins/diskio.html index 2cd9de34..4ec298bd 100644 --- a/glances/outputs/static/html/plugins/diskio.html +++ b/glances/outputs/static/html/plugins/diskio.html @@ -1,10 +1,16 @@
DISK I/O
-
R/s
-
W/s
+
R/s
+
W/s
+ +
IOR/s
+
IOW/s
{{disk.name | min_size}}
-
{{disk.readBytes | bytes}}
-
{{disk.writeBytes | bytes}}
+
{{disk.bitrate.txps | bytes}}
+
{{disk.bitrate.rxps | bytes}}
+ +
{{disk.count.txps | bytes}}
+
{{disk.count.rxps | bytes}}
diff --git a/glances/outputs/static/js/services/plugins/glances_diskio.js b/glances/outputs/static/js/services/plugins/glances_diskio.js index 2ba1a396..85889d40 100644 --- a/glances/outputs/static/js/services/plugins/glances_diskio.js +++ b/glances/outputs/static/js/services/plugins/glances_diskio.js @@ -8,11 +8,18 @@ glancesApp.service('GlancesPluginDiskio', function() { 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': diskioData['read_bytes'] / timeSinceUpdate, + 'rxps': diskioData['write_bytes'] / timeSinceUpdate + }, + 'count': { + 'txps': diskioData['read_count'] / timeSinceUpdate, + 'rxps': diskioData['write_count'] / timeSinceUpdate + } }; this.disks.push(diskio); diff --git a/glances/outputs/static/js/stats_controller.js b/glances/outputs/static/js/stats_controller.js index 6198a476..741f942e 100644 --- a/glances/outputs/static/js/stats_controller.js +++ b/glances/outputs/static/js/stats_controller.js @@ -34,7 +34,8 @@ glancesApp.controller('statsController', function ($scope, $rootScope, $interval 'network_io_cumulative': false, 'filesystem_freespace': false, 'network_by_bytes': false, - 'filesystem_free_space': false + 'filesystem_free_space': false, + 'diskio_iops': false }; $scope.init_refresh_time = function () { @@ -196,6 +197,10 @@ glancesApp.controller('statsController', function ($scope, $rootScope, $interval // b => Bytes or bits for network I/O $scope.show_hide('network_by_bytes'); break; + case $event.shiftKey && $event.keyCode == keycodes.b: + // 'B' => Switch between bit/s and IO/s for Disk IO + $scope.show_hide('diskio_iops'); + break; case !$event.shiftKey && $event.keyCode == keycodes.l: // l => Show/hide alert logs $scope.show_hide('alert'); From fc4e0f40ced154b7242564edc3a48710c8ea80c0 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Thu, 7 Jan 2016 19:58:50 +0100 Subject: [PATCH 2/3] Optimize diskio plugin in the webui --- glances/outputs/static/html/plugins/diskio.html | 10 +++++----- .../static/js/services/plugins/glances_diskio.js | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) 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) } }; From afbdd738c44ea57fb121037d2b9a90965c413e97 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Sun, 10 Jan 2016 10:20:58 +0100 Subject: [PATCH 3/3] Update help for disk iops --- glances/outputs/static/html/help.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glances/outputs/static/html/help.html b/glances/outputs/static/html/help.html index 5919ba16..3391d79b 100644 --- a/glances/outputs/static/html/help.html +++ b/glances/outputs/static/html/help.html @@ -40,7 +40,7 @@
{{help.show_hide_filesystem}}
-
+
{{help.diskio_iops}}
{{help.show_hide_network}}