Changeset 12435 for trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history

Timestamp:

06/12/15 14:59:54 (9 years ago)

Author:

dglaser

Message:

#2394: Improved PluginManager and updated hive status monitor.

Location:

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history

Files:

• history.cshtml (modified) (1 diff)
• historyCtrl.js (modified) (4 diffs)

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml

@@ -56 +56 @@
                 <div class="panel-body">
                     <flot dataset="coreSeries" options="fillChartOptions"></flot>
+                    <p>{{maxUpper}}</p>
+                    <p>{{fromDateTime}}</p>
+                    <p>{{toDateTime}}</p>
                 </div>
             </div>

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js

@@ -4 +4 @@
         ['$scope', '$interval', 'app.status.data.service',
         function ($scope, $interval, dataService) {
-
             $scope.chartOptions = {
                 grid: {
@@ -59 +58 @@
             };
 
+
             $scope.fromDate = new Date();
             $scope.toDate = new Date();
@@ -89 +89 @@
 
             var updateCharts = function () {
-                dataService.getStatusHistory({start: ConvertFromDate($scope.fromDate), end: ConvertToDate($scope.toDate)}, function (status) {
+                dataService.getStatusHistory({ start: ConvertFromDate($scope.fromDate), end: ConvertToDate($scope.toDate) }, function (status) {
                     var noOfStatus = status.length;
                     var cpuSeries = [];
@@ -96 +96 @@
                     for (var i = 0; i < noOfStatus; ++i) {
                         var curStatus = status[i];
-                        var cpuData = Math.round(curStatus.CpuUtilizationStatus.UsedCpuUtilization);
-                        var usedCores = curStatus.CoreStatus.TotalCores - curStatus.CoreStatus.FreeCores;
-                        var usedMemory = curStatus.MemoryStatus.TotalMemory - curStatus.MemoryStatus.FreeMemory;
+                        var cpuData = Math.round(curStatus.CpuUtilizationStatus.ActiveCpuUtilization);
                         cpuSeries.push([curStatus.Timestamp, cpuData]);
-                        coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.TotalCores]);
-                        coreSeries[1].push([curStatus.Timestamp, usedCores]);
-                        memorySeries[0].push([curStatus.Timestamp, curStatus.MemoryStatus.TotalMemory]);
-                        memorySeries[1].push([curStatus.Timestamp, usedMemory]);
+                        coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.ActiveCores]);
+                        coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.CalculatingCores]);
+                        memorySeries[0].push([curStatus.Timestamp, curStatus.MemoryStatus.ActiveMemory]);
+                        memorySeries[1].push([curStatus.Timestamp, curStatus.MemoryStatus.UsedMemory]);
                     }
                     $scope.cpuSeries = [{ data: cpuSeries, label: "&nbsp;CPU Utilization", color: "#f7921d" }];