Add IO rate to the docker plugin Web UI (issue #520)

5 files changed, 18 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 1ba0d8a7..60323ab0 100644
--- a/NEWS
+++ b/NEWS
@@ -8,14 +8,14 @@ Version 2.5
 Enhancements and new features:
 
     * Allow export of Docker and sensors plugins stats to InfluxDB, StatsD... (issue #600)
-    * Docker plugin shows network interface bitrate (issue #520)
+    * Docker plugin shows IO and network bitrate (issue #520)
     * Server password configuration for the browser mode (issue #500)
     * Add support for OpenTSDB export (issue #638)
     * Support Fahrenheit unit in the sensor plugin using the --fahrenheit command line option (issue #620)
     * WebUI display a message if server is not available (issue #564)
     * Display an error if export is not used in the standalone/client mode (issue #614)
     * New --disable-quicklook, --disable-cpu, --disable-mem, --disable-swap, --disable-load tags (issue #631)
-    * Complete refactoring of the WebUI thanks to the Floran pull (issue #656)
+    * Complete refactoring of the WebUI thanks to the (awesome) Floran pull (issue #656)
     * Network cumulative /combination feature available in the WebUI (issue #552)
 
 Bugs corrected:
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index fceeff28..267db465 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -2,7 +2,7 @@
 Glances
 =======
 
-This manual describes *Glances* version 2.4.2.
+This manual describes *Glances* version 2.5.
 
 Copyright © 2011-2015 Nicolas Hennion <nicolas@nicolargo.com>
 
diff --git a/glances/outputs/static/css/style.css b/glances/outputs/static/css/style.css
index 86b2b6f2..648949f9 100644
--- a/glances/outputs/static/css/style.css
+++ b/glances/outputs/static/css/style.css
@@ -94,10 +94,14 @@ body {
 }
 
 /* Plugins */
-#processlist .table-cell, #containers .table-cell {
+#processlist .table-cell {
     padding: 0px 5px 0px 5px;
     white-space: nowrap;
 }
+#containers .table-cell {
+    padding: 0px 10px 0px 10px;
+    white-space: nowrap;
+}
 gl-monitor-list {
     display: block;
 }
diff --git a/glances/outputs/static/html/plugins/docker.html b/glances/outputs/static/html/plugins/docker.html
index 7b0f5c97..b0ae92ae 100644
--- a/glances/outputs/static/html/plugins/docker.html
+++ b/glances/outputs/static/html/plugins/docker.html
@@ -2,23 +2,25 @@
 
 <div class="table">
     <div class="table-row">
-        <div class="table-cell">Id</div>
         <div class="table-cell text-left">Name</div>
         <div class="table-cell">Status</div>
         <div class="table-cell">CPU%</div>
         <div class="table-cell">MEM</div>
+        <div class="table-cell">IOR/s</div>
+        <div class="table-cell">IOW/s</div>
         <div class="table-cell">RX/s</div>
         <div class="table-cell">TX/s</div>
         <div class="table-cell text-left">Command</div>
     </div>
     <div class="table-row" ng-repeat="container in statsDocker.containers">
-        <div class="table-cell">{{ container.id | limitTo:12 }}</div>
         <div class="table-cell text-left">{{ container.name }}</div>
         <div class="table-cell" ng-class="container.status == 'Paused' ? 'careful' : 'ok'">{{ container.status }}</div>
         <div class="table-cell">{{ container.cpu | number:1 }}</div>
         <div class="table-cell">{{ container.memory | bytes }}</div>
-        <div class="table-cell">{{ container.rx / container.time_since_update | bits }}</div>
-        <div class="table-cell">{{ container.tx / container.time_since_update | bits }}</div>
+        <div class="table-cell">{{ container.ior / container.io_time_since_update | bits }}</div>
+        <div class="table-cell">{{ container.iow / container.io_time_since_update | bits }}</div>
+        <div class="table-cell">{{ container.rx / container.net_time_since_update | bits }}</div>
+        <div class="table-cell">{{ container.tx / container.net_time_since_update | bits }}</div>
         <div class="table-cell text-left">{{ container.command }}</div>
     </div>
 </div>
diff --git a/glances/outputs/static/js/services/plugins/glances_docker.js b/glances/outputs/static/js/services/plugins/glances_docker.js
index 2bc60414..06895e68 100644
--- a/glances/outputs/static/js/services/plugins/glances_docker.js
+++ b/glances/outputs/static/js/services/plugins/glances_docker.js
@@ -21,9 +21,12 @@ glancesApp.service('GlancesPluginDocker', function(GlancesPlugin) {
                 'status': containerData.Status,
                 'cpu': containerData.cpu.total,
                 'memory': containerData.memory.usage != undefined ? containerData.memory.usage : '?',
+                'ior': containerData.io.ior != undefined ? containerData.io.ior : '?',
+                'iow': containerData.io.iow != undefined ? containerData.io.iow : '?',
+                'io_time_since_update': containerData.io.time_since_update,
                 'rx': containerData.network.rx != undefined ? containerData.network.rx : '?',
                 'tx': containerData.network.tx != undefined ? containerData.network.tx : '?',
-                'time_since_update': containerData.network.time_since_update,
+                'net_time_since_update': containerData.network.time_since_update,
                 'command': containerData.Command,
                 'image': containerData.Image
             };