Merge pull request #1722 from anjz/fix_container_rss_value

Fix container rss value

3 files changed, 104 insertions, 55 deletions

diff --git a/glances/outputs/static/js/components/plugin-docker/controller.js b/glances/outputs/static/js/components/plugin-docker/controller.js
index 05bd8a6e..bee570eb 100644
--- a/glances/outputs/static/js/components/plugin-docker/controller.js
+++ b/glances/outputs/static/js/components/plugin-docker/controller.js
@@ -19,7 +19,7 @@ export default function GlancesPluginDockerController($scope, GlancesStats) {
                 'status': containerData.Status,
                 'cpu': containerData.cpu.total,
                 'memory': containerData.memory.usage != undefined ? containerData.memory.usage : '?',
-                'rss': containerData.memory.rss != undefined ? containerData.memory.usage: '?',
+                'rss': containerData.memory.rss != undefined ? containerData.memory.rss : '?',
                 '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,
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index 5ff1859f..6098b385 100644
--- a/glances/outputs/static/public/glances.js
+++ b/glances/outputs/static/public/glances.js
@@ -556,7 +556,7 @@ function updateLink (link, options, obj) {
   var undefined;
 
   /** Used as the semantic version number. */
-  var VERSION = '4.17.15';
+  var VERSION = '4.17.19';
 
   /** Used as the size to enable large array optimizations. */
   var LARGE_ARRAY_SIZE = 200;
@@ -4263,8 +4263,21 @@ function updateLink (link, options, obj) {
      * @returns {Array} Returns the new sorted array.
      */
     function baseOrderBy(collection, iteratees, orders) {
+      if (iteratees.length) {
+        iteratees = arrayMap(iteratees, function(iteratee) {
+          if (isArray(iteratee)) {
+            return function(value) {
+              return baseGet(value, iteratee.length === 1 ? iteratee[0] : iteratee);
+            }
+          }
+          return iteratee;
+        });
+      } else {
+        iteratees = [identity];
+      }
+
       var index = -1;
-      iteratees = arrayMap(iteratees.length ? iteratees : [identity], baseUnary(getIteratee()));
+      iteratees = arrayMap(iteratees, baseUnary(getIteratee()));
 
       var result = baseMap(collection, function(value, key, collection) {
         var criteria = arrayMap(iteratees, function(iteratee) {
@@ -4521,6 +4534,10 @@ function updateLink (link, options, obj) {
         var key = toKey(path[index]),
             newValue = value;
 
+        if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+          return object;
+        }
+
         if (index != lastIndex) {
           var objValue = nested[key];
           newValue = customizer ? customizer(objValue, key, nested) : undefined;
@@ -4673,11 +4690,14 @@ function updateLink (link, options, obj) {
      *  into `array`.
      */
     function baseSortedIndexBy(array, value, iteratee, retHighest) {
-      value = iteratee(value);
-
       var low = 0,
-          high = array == null ? 0 : array.length,
-          valIsNaN = value !== value,
+          high = array == null ? 0 : array.length;
+      if (high === 0) {
+        return 0;
+      }
+
+      value = iteratee(value);
+      var valIsNaN = value !== value,
           valIsNull = value === null,
           valIsSymbol = isSymbol(value),
           valIsUndefined = value === undefined;
@@ -6162,10 +6182,11 @@ function updateLink (link, options, obj) {
       if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
         return false;
       }
-      // Assume cyclic values are equal.
-      var stacked = stack.get(array);
-      if (stacked && stack.get(other)) {
-        return stacked == other;
+      // Check that cyclic values are equal.
+      var arrStacked = stack.get(array);
+      var othStacked = stack.get(other);
+      if (arrStacked && othStacked) {
+        return arrStacked == other && othStacked == array;
       }
       var index = -1,
           result = true,
@@ -6327,10 +6348,11 @@ function updateLink (link, options, obj) {
           return false;
         }
       }
-      // Assume cyclic values are equal.
-      var stacked = stack.get(object);
-      if (stacked && stack.get(other)) {
-        return stacked == other;
+      // Check that cyclic values are equal.
+      var objStacked = stack.get(object);
+      var othStacked = stack.get(other);
+      if (objStacked && othStacked) {
+        return objStacked == other && othStacked == object;
       }
       var result = true;
       stack.set(object, other);
@@ -9711,6 +9733,10 @@ function updateLink (link, options, obj) {
      * // The `_.property` iteratee shorthand.
      * _.filter(users, 'active');
      * // => objects for ['barney']
+     *
+     * // Combining several predicates using `_.overEvery` or `_.overSome`.
+     * _.filter(users, _.overSome([{ 'age': 36 }, ['age', 40]]));
+     * // => objects for ['fred', 'barney']
      */
     function filter(collection, predicate) {
       var func = isArray(collection) ? arrayFilter : baseFilter;
@@ -10460,15 +10486,15 @@ function updateLink (link, options, obj) {
      * var users = [
      *   { 'user': 'fred',   'age': 48 },
      *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 40 },
+     *   { 'user': 'fred',   'age': 30 },
      *   { 'user': 'barney', 'age': 34 }
      * ];
      *
      * _.sortBy(users, [function(o) { return o.user; }]);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 30]]
      *
      * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 40], ['fred', 48]]
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 30], ['fred', 48]]
      */
     var sortBy = baseRest(function(collection, iteratees) {
       if (collection == null) {
@@ -15343,11 +15369,11 @@ function updateLink (link, options, obj) {
 
       // Use a sourceURL for easier debugging.
       // The sourceURL gets injected into the source that's eval-ed, so be careful
-      // with lookup (in case of e.g. prototype pollution), and strip newlines if any.
-      // A newline wouldn't be a valid sourceURL anyway, and it'd enable code injection.
+      // to normalize all kinds of whitespace, so e.g. newlines (and unicode versions of it) can't sneak in
+      // and escape the comment, thus injecting code that gets evaled.
       var sourceURL = '//# sourceURL=' +
         (hasOwnProperty.call(options, 'sourceURL')
-          ? (options.sourceURL + '').replace(/[\r\n]/g, ' ')
+          ? (options.sourceURL + '').replace(/\s/g, ' ')
           : ('lodash.templateSources[' + (++templateCounter) + ']')
         ) + '\n';
 
@@ -15380,8 +15406,6 @@ function updateLink (link, options, obj) {
 
       // If `variable` is not specified wrap a with-statement around the generated
       // code to add the data object to the top of the scope chain.
-      // Like with sourceURL, we take care to not check the option's prototype,
-      // as this configuration is a code injection vector.
       var variable = hasOwnProperty.call(options, 'variable') && options.variable;
       if (!variable) {
         source = 'with (obj) {\n' + source + '\n}\n';
@@ -16088,6 +16112,9 @@ function updateLink (link, options, obj) {
      * values against any array or object value, respectively. See `_.isEqual`
      * for a list of supported value comparisons.
      *
+     * **Note:** Multiple values can be checked by combining several matchers
+     * using `_.overSome`
+     *
      * @static
      * @memberOf _
      * @since 3.0.0
@@ -16103,6 +16130,10 @@ function updateLink (link, options, obj) {
      *
      * _.filter(objects, _.matches({ 'a': 4, 'c': 6 }));
      * // => [{ 'a': 4, 'b': 5, 'c': 6 }]
+     *
+     * // Checking for several possible values
+     * _.filter(users, _.overSome([_.matches({ 'a': 1 }), _.matches({ 'a': 4 })]));
+     * // => [{ 'a': 1, 'b': 2, 'c': 3 }, { 'a': 4, 'b': 5, 'c': 6 }]
      */
     function matches(source) {
       return baseMatches(baseClone(source, CLONE_DEEP_FLAG));
@@ -16117,6 +16148,9 @@ function updateLink (link, options, obj) {
      * `srcValue` values against any array or object value, respectively. See
      * `_.isEqual` for a list of supported value comparisons.
      *
+     * **Note:** Multiple values can be checked by combining several matchers
+     * using `_.overSome`
+     *
      * @static
      * @memberOf _
      * @since 3.2.0
@@ -16133,6 +16167,10 @@ function updateLink (link, options, obj) {
      *
      * _.find(objects, _.matchesProperty('a', 4));
      * // => { 'a': 4, 'b': 5, 'c': 6 }
+     *
+     * // Checking for several possible values
+     * _.filter(users, _.overSome([_.matchesProperty('a', 1), _.matchesProperty('a', 4)]));
+     * // => [{ 'a': 1, 'b': 2, 'c': 3 }, { 'a': 4, 'b': 5, 'c': 6 }]
      */
     function matchesProperty(path, srcValue) {
       return baseMatchesProperty(path, baseClone(srcValue, CLONE_DEEP_FLAG));
@@ -16356,6 +16394,10 @@ function updateLink (link, options, obj) {
      * Creates a function that checks if **all** of the `predicates` return
      * truthy when invoked with the arguments it receives.
      *
+     * Following shorthands are possible for providing predicates.
+     * Pass an `Object` and it will be used as an parameter for `_.matches` to create the predicate.
+     * Pass an `Array` of parameters for `_.matchesProperty` and the predicate will be created using them.
+     *
      * @static
      * @memberOf _
      * @since 4.0.0
@@ -16382,6 +16424,10 @@ function updateLink (link, options, obj) {
      * Creates a function that checks if **any** of the `predicates` return
      * truthy when invoked with the arguments it receives.
      *
+     * Following shorthands are possible for providing predicates.
+     * Pass an `Object` and it will be used as an parameter for `_.matches` to create the predicate.
+     * Pass an `Array` of parameters for `_.matchesProperty` and the predicate will be created using them.
+     *
      * @static
      * @memberOf _
      * @since 4.0.0
@@ -16401,6 +16447,9 @@ function updateLink (link, options, obj) {
      *
      * func(NaN);
      * // => false
+     *
+     * var matchesFunc = _.overSome([{ 'a': 1 }, { 'a': 2 }])
+     * var matchesPropertyFunc = _.overSome([['a', 1], ['a', 2]])
      */
     var overSome = createOver(arraySome);
 
@@ -57455,7 +57504,7 @@ function GlancesController($scope, GlancesStats, hotkeys, ARGUMENTS) {
 /* 23 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/glances/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/glances/view.html';
 var html = "<div>\n    <div ng-if=\"!vm.dataLoaded\" class=\"container-fluid\" id=\"loading-page\">\n        <div class=\"glances-logo\"></div>\n        <div class=\"loader\">Loading...</div>\n    </div>\n\n    <glances-help ng-if=\"vm.arguments.help_tag\"></glances-help>\n\n    <div ng-if=\"vm.dataLoaded && !vm.arguments.help_tag\" class=\"container-fluid\">\n        <div class=\"top-plugin\">\n            <div class=\"row\">\n                <div class=\"col-sm-24\">\n                    <div class=\"pull-left\">\n                        <glances-plugin-system></glances-plugin-system>\n                    </div>\n                    <div class=\"pull-left\">\n                        <glances-plugin-ip></glances-plugin-ip>\n                    </div>\n                    <div class=\"pull-right\">\n                        <glances-plugin-uptime></glances-plugin-uptime>\n                    </div>\n                </div>\n                <div class=\"row\">\n                    <div class=\"col-sm-24\">\n                        <div class=\"pull-left\">\n                            <glances-plugin-cloud></glances-plugin-cloud>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n\n        <div class=\"row\">\n            <div class=\"hidden-xs hidden-sm hidden-md col-lg-6\" ng-if=\"!vm.arguments.disable_quicklook\">\n                <glances-plugin-quicklook></glances-plugin-quicklook>\n            </div>\n            <div class=\"col-sm-6 col-md-8 col-lg-6\" ng-if=\"!vm.arguments.disable_cpu && !vm.arguments.percpu\">\n                <glances-plugin-cpu></glances-plugin-cpu>\n            </div>\n            <div class=\"col-sm-12 col-md-8 col-lg-6\" ng-if=\"!vm.arguments.disable_cpu && vm.arguments.percpu\">\n                <glances-plugin-percpu></glances-plugin-percpu>\n            </div>\n            <div class=\"col-sm-6 col-md-4 col-lg-3\" ng-if=\"!vm.arguments.disable_gpu && vm.hasGpu\">\n                <glances-plugin-gpu></glances-plugin-gpu>\n            </div>\n            <div class=\"col-sm-6 col-md-4 col-lg-3\" ng-if=\"!vm.arguments.disable_mem\">\n                <glances-plugin-mem></glances-plugin-mem>\n            </div>\n            <div class=\"col-sm-6 col-md-4 col-lg-3\"\n                 ng-if=\"!vm.arguments.disable_mem && !(!vm.arguments.disable_gpu && vm.hasGpu)\">\n                <glances-plugin-mem-more></glances-plugin-mem-more>\n            </div>\n            <div class=\"col-sm-6 col-md-4 col-lg-3\" ng-if=\"!vm.arguments.disable_memswap\">\n                <glances-plugin-memswap></glances-plugin-memswap>\n            </div>\n            <div class=\"col-sm-6 col-md-4 col-lg-3\" ng-if=\"!vm.arguments.disable_load\">\n                <glances-plugin-load></glances-plugin-load>\n            </div>\n        </div>\n        <div class=\"row\">\n            <div class=\"col-sm-6 sidebar\" ng-if=\"!vm.arguments.disable_left_sidebar\">\n                <div class=\"table\">\n                    <glances-plugin-network id=\"plugin-network\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.disable_network\"></glances-plugin-network>\n                    <glances-plugin-connections id=\"plugin-connections\" class=\"plugin table-row-group\" ng-if=\"vm.isLinux && !vm.arguments.disable_connections\"></glances-plugin-connections>\n                    <glances-plugin-wifi id=\"plugin-wifi\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.disable_wifi\"></glances-plugin-wifi>\n                    <glances-plugin-ports id=\"plugin-ports\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.disable_ports\"></glances-plugin-ports>\n                    <glances-plugin-diskio id=\"plugin-diskio\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.disable_diskio\"></glances-plugin-diskio>\n                    <glances-plugin-fs id=\"plugin-fs\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.disable_fs\"></glances-plugin-fs>\n                    <glances-plugin-irq id=\"plugin-irq\" class=\"plugin table-row-group\" ng-if=\"vm.arguments.enable_irq\"></glances-plugin-irq>\n                    <glances-plugin-folders id=\"plugin-folders\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.disable_folders\"></glances-plugin-folders>\n                    <glances-plugin-raid id=\"plugin-raid\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.raid\"></glances-plugin-raid>\n                    <glances-plugin-sensors id=\"plugin-sensors\" class=\"plugin table-row-group\" ng-if=\"!vm.arguments.disable_sensors\"></glances-plugin-sensors>\n                </div>\n            </div>\n            <div class=\"col-sm-18\">\n                <glances-plugin-docker ng-if=\"!vm.arguments.disable_docker\"></glances-plugin-docker>\n                <glances-plugin-alert ng-if=\"!vm.arguments.disable_alert\"></glances-plugin-alert>\n                <glances-plugin-process></glances-plugin-process>\n            </div>\n        </div>\n    </div>\n</div>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -57503,7 +57552,7 @@ function GlancesHelpController($http) {
 /* 26 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/help/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/help/view.html';
 var html = "<div class=\"container-fluid\">\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-24\">{{vm.help.version}} {{vm.help.psutil_version}}</div>\n    </div>\n    <div class=\"row\">&nbsp;</div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-24\">{{vm.help.configuration_file}}</div>\n    </div>\n    <div class=\"row\">&nbsp;</div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_auto}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_network}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_cpu}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_alert}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_mem}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.percpu}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_user}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_ip}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_proc}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.enable_disable_docker}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_io}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.view_network_io_combination}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.sort_cpu_times}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.view_cumulative_network}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_diskio}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_filesytem_freespace}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_filesystem}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_vm.help}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_network}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.diskio_iops}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_sensors}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_top_menu}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_left_sidebar}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_amp}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.enable_disable_process_stats}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.show_hide_irq}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.enable_disable_gpu}}</div>\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.enable_disable_mean_gpu}}</div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.enable_disable_quick_look}}</div>\n        <div class=\"col-sm-12 col-lg-6\"></div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.enable_disable_short_processname}}</div>\n        <div class=\"col-sm-12 col-lg-6\"></div>\n    </div>\n    <div class=\"row\">\n        <div class=\"col-sm-12 col-lg-6\">{{vm.help.enable_disable_ports}}</div>\n        <div class=\"col-sm-12 col-lg-6\"></div>\n    </div>\n\n</div>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -57607,7 +57656,7 @@ function GlancesPluginAlertController($scope, favicoService) {
 /* 29 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-alert/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-alert/view.html';
 var html = "<section id=\"alerts\">\n    <span class=\"title\" ng-if=\"!vm.hasAlerts()\">No warning or critical alert detected</span>\n    <span class=\"title\" ng-if=\"vm.hasAlerts()\">Warning or critical alerts (last {{vm.count()}} entries)</span>\n</section>\n<section id=\"alert\" class=\"plugin\">\n    <div class=\"table\">\n        <div class=\"table-row\" ng-repeat=\"alert in vm.getAlerts()\">\n            <div class=\"table-cell text-left\">\n                {{alert.begin | date : 'yyyy-MM-dd H:mm:ss'}} ({{ alert.ongoing ? 'ongoing' : alert.duration }}) - <span\n                    ng-hide=\"alert.ongoing\">{{alert.level}} on</span> <span class=\"{{ alert.level | lowercase }}\">{{alert.name}}</span>\n                ({{alert.max| number:1 }})\n            </div>\n        </div>\n    </div>\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -57690,7 +57739,7 @@ function GlancesPluginAmpsController($scope, GlancesStats, favicoService) {
 /* 32 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-amps/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-amps/view.html';
 var html = "<section id=\"amps\" class=\"plugin\">\n    <div class=\"table\">\n        <div class=\"table-row\" ng-repeat=\"process in vm.processes\">\n            <div class=\"table-cell text-left\" ng-class=\"vm.getDescriptionDecoration(process)\">{{ process.name }}</div>\n            <div class=\"table-cell text-left\">{{ process.count }}</div>\n            <div class=\"table-cell text-left process-result\" ng-bind-html=\"process.result|nl2br\"></div>\n        </div>\n    </div>\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -57754,7 +57803,7 @@ function GlancesPluginCloudController($scope, GlancesStats) {
 /* 35 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-cloud/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-cloud/view.html';
 var html = "<section id=\"cloud\">\n    <span class=\"title\">{{ vm.provider }}</span> {{ vm.instance }}\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -57835,7 +57884,7 @@ function GlancesPluginConnectionsController($scope, GlancesStats) {
 /* 38 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-connections/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-connections/view.html';
 var html = "<div class=\"table-row\">\n    <div class=\"table-cell text-left title\">TCP CONNECTIONS</div>\n    <div class=\"table-cell\"></div>\n</div>\n<div class=\"table-row\">\n    <div class=\"table-cell text-left\">Listen</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\">{{vm.listen}}</div>\n</div>\n<div class=\"table-row\">\n    <div class=\"table-cell text-left\">Initiated</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\">{{vm.initiated}}</div>\n</div>\n<div class=\"table-row\">\n    <div class=\"table-cell text-left\">Established</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\">{{vm.established}}</div>\n</div>\n<div class=\"table-row\">\n    <div class=\"table-cell text-left\">Terminated</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\">{{vm.terminated}}</div>\n</div>\n<div class=\"table-row\">\n    <div class=\"table-cell text-left\">Tracked</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\" ng-class=\"vm.getDecoration('nf_conntrack_percent')\">{{vm.tracked.count}}/{{vm.tracked.max}}</div>\n</div>\n\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -57941,7 +57990,7 @@ function GlancesPluginCpuController($scope, GlancesStats) {
 /* 41 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-cpu/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-cpu/view.html';
 var html = "<section id=\"cpu\" class=\"plugin\">\n    <div class=\"row\">\n        <div class=\"col-sm-24 col-md-12 col-lg-8\">\n            <div class=\"table\">\n                <div class=\"table-row\">\n                    <div class=\"table-cell text-left title\">CPU</div>\n                    <div class=\"table-cell\">{{ vm.total }}%</div>\n                </div>\n                <div class=\"table-row\">\n                    <div class=\"table-cell text-left\">user:</div>\n                    <div class=\"table-cell\" ng-class=\"vm.getDecoration('user')\">\n                        {{ vm.user }}%\n                    </div>\n                </div>\n                <div class=\"table-row\">\n                    <div class=\"table-cell text-left\">system:</div>\n                    <div class=\"table-cell\" ng-class=\"vm.getDecoration('system')\">\n                        {{ vm.system }}%\n                    </div>\n                </div>\n                <div class=\"table-row\">\n                    <div class=\"table-cell text-left\">idle:</div>\n                    <div class=\"table-cell\">{{ vm.idle }}%</div>\n                </div>\n            </div>\n        </div>\n        <div class=\"hidden-xs hidden-sm col-md-12 col-lg-8\">\n            <div class=\"table\">\n                <div class=\"table-row\" ng-show=\"vm.nice != undefined\">\n                    <div class=\"table-cell text-left\">nice:</div>\n                    <div class=\"table-cell\">\n                        {{ vm.nice }}%\n                    </div>\n                </div>\n                <div class=\"table-row\" ng-show=\"vm.irq != undefined\">\n                    <div class=\"table-cell text-left\">irq:</div>\n                    <div class=\"table-cell\">\n                        {{ vm.irq }}%\n                    </div>\n                </div>\n                <div class=\"table-row\" ng-show=\"vm.iowait != undefined\">\n                    <div class=\"table-cell text-left\">iowait:</div>\n                    <div class=\"table-cell\" ng-class=\"vm.getDecoration('iowait')\">\n                        {{ vm.iowait }}%\n                    </div>\n                </div>\n                <div class=\"table-row\" ng-show=\"vm.steal != undefined\">\n                    <div class=\"table-cell text-left\">steal:</div>\n                    <div class=\"table-cell\" ng-class=\"vm.getDecoration('steal')\">\n                        {{ vm.steal }}%\n                    </div>\n                </div>\n            </div>\n        </div>\n        <div class=\"hidden-xs hidden-sm hidden-md col-lg-8\">\n            <div class=\"table\">\n                <div class=\"table-row\" ng-if=\"vm.ctx_switches\">\n                    <div class=\"table-cell text-left\">ctx_sw:</div>\n                    <div class=\"table-cell\" ng-class=\"vm.getDecoration('ctx_switches')\">\n                        {{ vm.ctx_switches }}\n                    </div>\n                </div>\n                <div class=\"table-row\" ng-if=\"vm.interrupts\">\n                    <div class=\"table-cell text-left\">inter:</div>\n                    <div class=\"table-cell\">\n                        {{ vm.interrupts }}\n                    </div>\n                </div>\n                <div class=\"table-row\" ng-if=\"vm.soft_interrupts\">\n                    <div class=\"table-cell text-left\">sw_int:</div>\n                    <div class=\"table-cell\">\n                        {{ vm.soft_interrupts }}\n                    </div>\n                </div>\n                <div class=\"table-row\" ng-if=\"!vm.isLinux && vm.syscalls\">\n                    <div class=\"table-cell text-left\">syscal:</div>\n                    <div class=\"table-cell\">\n                        {{ vm.syscalls }}\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58017,7 +58066,7 @@ function GlancesPluginDiskioController($scope, $filter, GlancesStats, ARGUMENTS)
 /* 44 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-diskio/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-diskio/view.html';
 var html = "<div class=\"table-row\" ng-if=\"vm.disks.length > 0\">\n    <div class=\"table-cell text-left title\">DISK I/O</div>\n    <div class=\"table-cell\" ng-show=\"!vm.arguments.diskio_iops\">R/s</div>\n    <div class=\"table-cell\" ng-show=\"!vm.arguments.diskio_iops\">W/s</div>\n\n    <div class=\"table-cell\" ng-show=\"vm.arguments.diskio_iops\">IOR/s</div>\n    <div class=\"table-cell\" ng-show=\"vm.arguments.diskio_iops\">IOW/s</div>\n</div>\n<div class=\"table-row\" ng-repeat=\"disk in vm.disks\">\n    <div class=\"table-cell text-left\">{{(disk.alias ? disk.alias : disk.name) | min_size:9}}</div>\n    <div class=\"table-cell\" ng-show=\"!vm.arguments.diskio_iops\">{{disk.bitrate.txps }}</div>\n    <div class=\"table-cell\" ng-show=\"!vm.arguments.diskio_iops\">{{disk.bitrate.rxps }}</div>\n\n    <div class=\"table-cell\" ng-show=\"vm.arguments.diskio_iops\">{{disk.count.txps }}</div>\n    <div class=\"table-cell\" ng-show=\"vm.arguments.diskio_iops\">{{disk.count.rxps }}</div>\n</div>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58072,7 +58121,7 @@ function GlancesPluginDockerController($scope, GlancesStats) {
                 'status': containerData.Status,
                 'cpu': containerData.cpu.total,
                 'memory': containerData.memory.usage != undefined ? containerData.memory.usage : '?',
-                'rss': containerData.memory.rss != undefined ? containerData.memory.usage: '?',
+                'rss': containerData.memory.rss != undefined ? containerData.memory.rss : '?',
                 '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,
@@ -58101,7 +58150,7 @@ function GlancesPluginDockerController($scope, GlancesStats) {
 /* 47 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-docker/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-docker/view.html';
 var html = "<section id=\"containers-plugin\" class=\"plugin\" ng-if=\"vm.containers.length\">\n    <span class=\"title\">CONTAINERS</span> {{ vm.containers.length }} (served by Docker {{ vm.version }})\n\n    <div class=\"table\">\n        <div class=\"table-row\">\n            <div class=\"table-cell text-left\">Name</div>\n            <div class=\"table-cell\">Status</div>\n            <div class=\"table-cell\">CPU%</div>\n            <div class=\"table-cell\">MEM</div>\n            <div class=\"table-cell\">RSS</div>\n            <div class=\"table-cell\">IOR/s</div>\n            <div class=\"table-cell\">IOW/s</div>\n            <div class=\"table-cell\">RX/s</div>\n            <div class=\"table-cell\">TX/s</div>\n            <div class=\"table-cell text-left\">Command</div>\n        </div>\n        <div class=\"table-row\" ng-repeat=\"container in vm.containers track by container.id\">\n            <div class=\"table-cell text-left\">{{ container.name }}</div>\n            <div class=\"table-cell\" ng-class=\"container.status == 'Paused' ? 'careful' : 'ok'\">{{ container.status }}\n            </div>\n            <div class=\"table-cell\">{{ container.cpu | number:1 }}</div>\n            <div class=\"table-cell\">{{ container.memory | bytes }}</div>\n            <div class=\"table-cell\">{{ container.rss | bytes }}</div>\n            <div class=\"table-cell\">{{ container.ior / container.io_time_since_update | bits }}</div>\n            <div class=\"table-cell\">{{ container.iow / container.io_time_since_update | bits }}</div>\n            <div class=\"table-cell\">{{ container.rx / container.net_time_since_update | bits }}</div>\n            <div class=\"table-cell\">{{ container.tx / container.net_time_since_update | bits }}</div>\n            <div class=\"table-cell text-left\">{{ container.command }}</div>\n        </div>\n    </div>\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58190,7 +58239,7 @@ function GlancesPluginFoldersController($scope, GlancesStats) {
 /* 50 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-folders/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-folders/view.html';
 var html = "<div class=\"table-row\" ng-if=\"vm.folders.length > 0\">\n    <div class=\"table-cell text-left title\">FOLDERS</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\">Size</div>\n</div>\n<div class=\"table-row\" ng-repeat=\"folder in vm.folders\">\n    <div class=\"table-cell text-left\">{{ folder.path }}</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\" ng-class=\"vm.getDecoration(folder)\">{{ folder.size | bytes }}</div>\n</div>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58280,7 +58329,7 @@ function GlancesPluginFsController($scope, $filter, GlancesStats, ARGUMENTS) {
 /* 53 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-fs/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-fs/view.html';
 var html = "<div class=\"table-row\">\n    <div class=\"table-cell text-left title\">FILE SYS</div>\n    <div class=\"table-cell\">\n        <span ng-show=\"!vm.arguments.fs_free_space\">Used</span>\n        <span ng-show=\"vm.arguments.fs_free_space\">Free</span>\n    </div>\n    <div class=\"table-cell\">Total</div>\n</div>\n<div class=\"table-row\" ng-repeat=\"fs in vm.fileSystems\">\n    <div class=\"table-cell text-left\">{{ fs.shortMountPoint }} <span class=\"visible-lg-inline\"\n                                                                     ng-show=\"fs.name.length <= 20\">({{ fs.name }})<span>\n    </div>\n    <div class=\"table-cell\" ng-class=\"vm.getDecoration(fs.mountPoint, 'used')\">\n        <span ng-show=\"!vm.arguments.fs_free_space\">{{ fs.used | bytes }}</span>\n        <span ng-show=\"vm.arguments.fs_free_space\">{{ fs.free | bytes }}</span>\n    </div>\n    <div class=\"table-cell\">{{ fs.size | bytes }}</div>\n</div>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58386,7 +58435,7 @@ function GlancesPluginGpuController($scope, GlancesStats, ARGUMENTS) {
 /* 56 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-gpu/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-gpu/view.html';
 var html = "<section id=\"gpu\" class=\"plugin\">\n    <div class=\"gpu-name title\">\n        {{ vm.name }}\n    </div>\n    <div class=\"table\">\n        <div class=\"table-row\" ng-if=\"arguments.meangpu || vm.gpus.length === 1\">\n            <div class=\"table-cell text-left\">proc:</div>\n            <div class=\"table-cell\" ng-class=\"vm.getMeanDecoration('proc')\" ng-if=\"vm.mean.proc\">{{ vm.mean.proc |\n                number : 0 }}%\n            </div>\n            <div class=\"table-cell\" ng-if=\"!vm.mean.proc\">N/A</div>\n        </div>\n        <div class=\"table-row\" ng-if=\"arguments.meangpu || vm.gpus.length === 1\">\n            <div class=\"table-cell text-left\">mem:</div>\n            <div class=\"table-cell\" ng-class=\"vm.getMeanDecoration('mem')\" ng-if=\"vm.mean.mem\">{{ vm.mean.mem | number :\n                0 }}%\n            </div>\n            <div class=\"table-cell\" ng-if=\"!vm.mean.mem\">N/A</div>\n        </div>\n        <div class=\"table-row\" ng-if=\"!arguments.meangpu && vm.gpus.length > 1\" ng-repeat=\"gpu in vm.gpus\">\n            <div class=\"table-cell text-left\">\n                {{ gpu.gpu_id }}:\n                <span ng-class=\"vm.getDecoration(gpu.gpu_id, 'proc')\"\n                      ng-if=\"gpu.proc\">{{ gpu.proc | number : 0 }}%</span>\n                <span ng-if=\"!gpu.proc\">N/A</span>\n                mem:\n                <span ng-class=\"vm.getDecoration(gpu.gpu_id, 'mem')\" ng-if=\"gpu.mem\">{{ gpu.mem | number : 0 }}%</span>\n                <span ng-if=\"!gpu.mem\">N/A</span>\n            </div>\n        </div>\n    </div>\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58455,7 +58504,7 @@ function GlancesPluginIpController($scope, GlancesStats, ARGUMENTS) {
 /* 59 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-ip/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-ip/view.html';
 var html = "<section id=\"ip\" ng-if=\"vm.address != undefined && !vm.arguments.disable_ip\">\n    &nbsp;-&nbsp;<span class=\"title\">IP</span>&nbsp;<span>{{ vm.address }}/{{ vm.maskCidr }}</span>&nbsp;<span\n        ng-if=\"vm.publicAddress\" class=\"title\">Pub</span>&nbsp;<span>{{ vm.publicAddress }}</span>\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58524,7 +58573,7 @@ function GlancesPluginIrqController($scope, GlancesStats) {
 /* 62 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-irq/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-irq/view.html';
 var html = "<div class=\"table-row\" ng-if=\"vm.irqs.length > 0\">\n    <div class=\"table-cell text-left title\">IRQ</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\">Rate/s</div>\n</div>\n<div class=\"table-row\" ng-repeat=\"irq in vm.irqs\">\n    <div class=\"table-cell text-left\">{{irq.irq_line}}</div>\n    <div class=\"table-cell\"></div>\n    <div class=\"table-cell\"><span>{{irq.irq_rate}}</span></div>\n</div>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58600,7 +58649,7 @@ function GlancesPluginLoadController($scope, GlancesStats) {
 /* 65 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-load/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-load/view.html';
 var html = "<section id=\"load\" class=\"plugin\" ng-if=\"vm.cpucore != undefined\">\n    <div class=\"table\">\n        <div class=\"table-row\">\n            <div class=\"table-cell text-left title\">LOAD</div>\n            <div class=\"table-cell\">{{ vm.cpucore }}-core</div>\n        </div>\n        <div class=\"table-row\">\n            <div class=\"table-cell text-left\">1 min:</div>\n            <div class=\"table-cell\">\n                {{ vm.min1 | number : 2}}\n            </div>\n        </div>\n        <div class=\"table-row\">\n            <div class=\"table-cell text-left\">5 min:</div>\n            <div class=\"table-cell\" ng-class=\"vm.getDecoration('min5')\">\n                {{ vm.min5 | number : 2}}\n            </div>\n        </div>\n        <div class=\"table-row\">\n            <div class=\"table-cell text-left\">15 min:</div>\n            <div class=\"table-cell\" ng-class=\"vm.getDecoration('min15')\">\n                {{ vm.min15 | number : 2}}\n            </div>\n        </div>\n    </div>\n</section>\n";
 window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
 module.exports = path;
@@ -58676,7 +58725,7 @@ function GlancesPluginMemController($scope, GlancesStats) {
 /* 68 */
 /***/ (function(module, exports) {
 
-var path = '/home/nicolargo/dev/glances/glances/outputs/static/js/components/plugin-mem/view.html';
+var path = '/Users/anartzn/Desktop/fork-glances/glances/glances/outputs/static/js/components/plugin-mem/view.html';
 var html = "<section id=\"mem\" class=\"plugin\">\n    <div class=\"table\">\n        <div class=\"table-row\">\n            <div class=\"table-cell text-left title\">MEM