Merge pull request #592 from notFloran/web-ui-limits-alert-log

[Web UI] Load: take core number into account

9 files changed, 42 insertions, 35 deletions

diff --git a/glances/outputs/static/html/plugins/cpu.html b/glances/outputs/static/html/plugins/cpu.html
index 3e78b419..84d5f2d0 100644
--- a/glances/outputs/static/html/plugins/cpu.html
+++ b/glances/outputs/static/html/plugins/cpu.html
@@ -5,13 +5,13 @@
     </div>
     <div class="table-row">
         <div class="table-cell text-left">user:</div>
-        <div class="table-cell" ng-class="getClass('cpu', 'cpu_user_', result['cpu'].user, 1)">
+        <div class="table-cell" ng-class="getAlertLog('cpu', 'cpu_user_', result['cpu'].user)">
             {{result["cpu"].user}}%
         </div>
     </div>
     <div class="table-row">
         <div class="table-cell text-left">system:</div>
-        <div class="table-cell" ng-class="getClass('cpu', 'cpu_system_', result['cpu'].system, 1)">
+        <div class="table-cell" ng-class="getAlertLog('cpu', 'cpu_system_', result['cpu'].system)">
             {{result["cpu"].system}}%
         </div>
     </div>
@@ -27,13 +27,13 @@
     </div>
     <div class="table-row">
         <div class="table-cell text-left">user:</div>
-        <div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getClass('percpu', 'percpu_user_', percpu.user, 0)">
+        <div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getAlert('percpu', 'percpu_user_', percpu.user)">
             {{percpu.user}}%
         </div>
     </div>
     <div class="table-row">
         <div class="table-cell text-left">system:</div>
-        <div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getClass('percpu', 'percpu_system_', percpu.system, 0)">
+        <div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getAlert('percpu', 'percpu_system_', percpu.system)">
             {{percpu.system}}%
         </div>
     </div>
diff --git a/glances/outputs/static/html/plugins/cpu_more.html b/glances/outputs/static/html/plugins/cpu_more.html
index 1814bb83..2c16332a 100644
--- a/glances/outputs/static/html/plugins/cpu_more.html
+++ b/glances/outputs/static/html/plugins/cpu_more.html
@@ -13,13 +13,13 @@
     </div>
     <div class="table-row" ng-if="result['cpu'].iowait != undefined">
         <div class="table-cell text-left">iowait:</div>
-        <div class="table-cell" ng-class="getClass('cpu', 'cpu_iowait_', result['cpu'].iowait, 1)">
+        <div class="table-cell" ng-class="getAlertLog('cpu', 'cpu_iowait_', result['cpu'].iowait)">
             {{result["cpu"].iowait}}%
         </div>
     </div>
     <div class="table-row" ng-if="result['cpu'].steal != undefined">
         <div class="table-cell text-left">steal:</div>
-        <div class="table-cell" ng-class="getClass('cpu', 'cpu_steal_', result['cpu'].steal, 0)">
+        <div class="table-cell" ng-class="getAlert('cpu', 'cpu_steal_', result['cpu'].steal)">
             {{result["cpu"].steal}}%
         </div>
     </div>
diff --git a/glances/outputs/static/html/plugins/fs.html b/glances/outputs/static/html/plugins/fs.html
index 4bdfb26d..cd26163c 100644
--- a/glances/outputs/static/html/plugins/fs.html
+++ b/glances/outputs/static/html/plugins/fs.html
@@ -5,7 +5,7 @@
 </div>
 <div class="table-row" ng-repeat="fs in result['fs'] | orderBy:  'mnt_point'">
     <div class="table-cell text-left">{{fs.mnt_point}} ({{fs.device_name}})</div>
-    <div class="table-cell" ng-class="getClass('fs', 'fs_', fs.percent, 0)">
+    <div class="table-cell" ng-class="getAlert('fs', 'fs_', fs.percent)">
         {{fs.size - fs.free | bytes}}
     </div>
     <div class="table-cell">{{fs.size | bytes}}</div>
diff --git a/glances/outputs/static/html/plugins/load.html b/glances/outputs/static/html/plugins/load.html
index 3384915c..32677109 100644
--- a/glances/outputs/static/html/plugins/load.html
+++ b/glances/outputs/static/html/plugins/load.html
@@ -11,13 +11,13 @@
     </div>
     <div class="table-row">
         <div class="table-cell text-left">5 min:</div>
-        <div class="table-cell" ng-class="getClass('load', 'load_', result['load'].min5, 0)">
+        <div class="table-cell" ng-class="getAlert('load', 'load_', result['load'].min5, 100 * result['load'].cpucore)">
             {{result["load"].min5 | number : 2}}
         </div>
     </div>
     <div class="table-row">
         <div class="table-cell text-left">15 min:</div>
-        <div class="table-cell" ng-class="getClass('load', 'load_', result['load'].min15, 1)">
+        <div class="table-cell" ng-class="getAlertLog('load', 'load_', result['load'].min15, 100 * result['load'].cpucore)">
             {{result["load"].min15 | number : 2}}
         </div>
     </div>
diff --git a/glances/outputs/static/html/plugins/mem.html b/glances/outputs/static/html/plugins/mem.html
index e3996ec3..c02ff402 100644
--- a/glances/outputs/static/html/plugins/mem.html
+++ b/glances/outputs/static/html/plugins/mem.html
@@ -9,7 +9,7 @@
     </div>
     <div class="table-row">
         <div class="table-cell text-left">used:</div>
-        <div class="table-cell" ng-class="getClass('mem', 'mem_', result['mem'].percent, 1)">
+        <div class="table-cell" ng-class="getAlertLog('mem', 'mem_', result['mem'].percent)">
             {{result["mem"].used | bytes:2}}
         </div>
     </div>
diff --git a/glances/outputs/static/html/plugins/memswap.html b/glances/outputs/static/html/plugins/memswap.html
index 54f02e2d..af9c4025 100644
--- a/glances/outputs/static/html/plugins/memswap.html
+++ b/glances/outputs/static/html/plugins/memswap.html
@@ -9,7 +9,7 @@
     </div>
     <div class="table-row">
         <div class="table-cell text-left">used:</div>
-        <div class="table-cell" ng-class="getClass('memswap', 'memswap_', result['memswap'].percent, 1)">
+        <div class="table-cell" ng-class="getAlertLog('memswap', 'memswap_', result['memswap'].percent)">
             {{result["memswap"].used | bytes}}
         </div>
     </div>
diff --git a/glances/outputs/static/html/plugins/processlist.html b/glances/outputs/static/html/plugins/processlist.html
index db51faa7..d738721b 100644
--- a/glances/outputs/static/html/plugins/processlist.html
+++ b/glances/outputs/static/html/plugins/processlist.html
@@ -14,8 +14,8 @@
         <div sortable-th sorter="sorter" column="name" class="table-cell text-left">Command</div>
     </div>
     <div class="table-row" ng-repeat="process in result['processlist'] | orderBy:sorter.column:sorter.isReverseColumn(sorter.column)">
-        <div class="table-cell" ng-class="getClass('processlist', 'processlist_cpu_', process.cpu_percent, 0)">{{process.cpu_percent | number:1}}</div>
-        <div class="table-cell" ng-class="getClass('processlist', 'processlist_mem_', process.memory_percent, 0)">{{process.memory_percent | number:1}}</div>
+        <div class="table-cell" ng-class="getAlert('processlist', 'processlist_cpu_', process.cpu_percent)">{{process.cpu_percent | number:1}}</div>
+        <div class="table-cell" ng-class="getAlert('processlist', 'processlist_mem_', process.memory_percent)">{{process.memory_percent | number:1}}</div>
         <div class="table-cell hidden-xs hidden-sm">{{process.memvirt | bytes}}</div>
         <div class="table-cell hidden-xs hidden-sm">{{process.memres | bytes}}</div>
         <div class="table-cell">{{process.pid}}</div>
diff --git a/glances/outputs/static/html/plugins/sensors.html b/glances/outputs/static/html/plugins/sensors.html
index 770cc3db..0ee09581 100644
--- a/glances/outputs/static/html/plugins/sensors.html
+++ b/glances/outputs/static/html/plugins/sensors.html
@@ -4,10 +4,10 @@
 <div class="table-row" ng-repeat="sensor in result['sensors']">
     <div class="table-cell text-left">{{ sensor.label }}</div>
     <div class="table-cell">{{ sensor.unit }}</div>
-    <div class="table-cell" ng-if="sensor.type != 'battery'" ng-class="getClass('sensors', 'sensors_' + sensor.type + '_', sensor.value, 0)">
+    <div class="table-cell" ng-if="sensor.type != 'battery'" ng-class="getAlert('sensors', 'sensors_' + sensor.type + '_', sensor.value)">
         {{ sensor.value }}
     </div>
-    <div class="table-cell" ng-if="sensor.type == 'battery'" ng-class="getClass('sensors', 'sensors_' + sensor.type + '_', 100 - sensor.value, 0)">
+    <div class="table-cell" ng-if="sensor.type == 'battery'" ng-class="getAlert('sensors', 'sensors_' + sensor.type + '_', 100 - sensor.value)">
         {{ sensor.value }}
     </div>
 </div>
diff --git a/glances/outputs/static/js/stats_controller.js b/glances/outputs/static/js/stats_controller.js
index 344dae1e..026209f1 100644
--- a/glances/outputs/static/js/stats_controller.js
+++ b/glances/outputs/static/js/stats_controller.js
@@ -162,26 +162,33 @@ glancesApp.controller('statsController', function($scope, $http, $interval, $q,
       return false;
     }
 
-    $scope.getClass = function(pluginName, limitNamePrefix, value, num) {
-        if ($scope.pluginLimits != undefined && $scope.pluginLimits[pluginName] != undefined) {
-            for (var i = 0; i < $scope.limitSuffix.length; i++) {
-                var limitName = limitNamePrefix + $scope.limitSuffix[i]
-                var limit = $scope.pluginLimits[pluginName][limitName]
-
-                if (value >= limit) {
-                    var pos = limitName.lastIndexOf("_")
-                    var className = limitName.substring(pos + 1)
-                    if (num == 1) {
-                        return className + '_log'
-                    }
-                    return className
-                }
-            }
-        }
-        if (num == 1) {
-            return "ok_log"
-        }
-        return "ok";
+    $scope.getAlert = function(pluginName, limitNamePrefix, current, maximum, log) {
+      current = current || 0;
+      maximum = maximum || 100;
+      log = log || false;
+      log_str = log ? '_log' : '';
+
+      var value = (current * 100) / maximum;
+
+      if ($scope.pluginLimits != undefined && $scope.pluginLimits[pluginName] != undefined) {
+          for (var i = 0; i < $scope.limitSuffix.length; i++) {
+              var limitName = limitNamePrefix + $scope.limitSuffix[i]
+              var limit = $scope.pluginLimits[pluginName][limitName]
+
+              if (value >= limit) {
+                  var pos = limitName.lastIndexOf("_")
+                  var className = limitName.substring(pos + 1)
+
+                  return className + log_str;
+              }
+          }
+      }
+
+      return "ok" + log_str;
+    }
+
+    $scope.getAlertLog = function(pluginName, limitNamePrefix, current, maximum) {
+      return $scope.getAlert(pluginName, limitNamePrefix, current, maximum, true);
     }
 
     $scope.init_refresh_time();