Changeset 12586 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status

Timestamp:

07/03/15 16:40:34 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js

@@ -125 +125 @@
                         }
                     }
-                    cpuSeries.push([$scope.status.Timestamp, $scope.cpu.knobData]);
-
+                    
+                    cpuSeries.push([$scope.status.Timestamp, Math.round(status.CpuUtilizationStatus.TotalCpuUtilization)]);
                     coreSeries[0].push([$scope.status.Timestamp, status.CoreStatus.TotalCores]);
                     coreSeries[1].push([$scope.status.Timestamp, status.CoreStatus.UsedCores]);