- Timestamp:
- 06/30/15 13:12:07 (9 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
-
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js
r12522 r12551 78 78 for (var i = 0; i < noOfStatus; ++i) { 79 79 var curStatus = status[i]; 80 var cpuData = Math.round(curStatus.CpuUtilizationStatus. ActiveCpuUtilization);80 var cpuData = Math.round(curStatus.CpuUtilizationStatus.TotalCpuUtilization); 81 81 cpuSeries.push([curStatus.Timestamp, cpuData]); 82 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus. ActiveCores]);83 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus. CalculatingCores]);84 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus. ActiveMemory / 1024)]);82 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.TotalCores]); 83 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.UsedCores]); 84 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.TotalMemory / 1024)]); 85 85 memorySeries[1].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.UsedMemory / 1024)]); 86 86 } … … 94 94 { data: memorySeries[1], label: " Used Memory", color: "LightPink" } 95 95 ]; 96 97 96 }); 98 97 }; -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml
r12522 r12551 80 80 <tr data-toggle="tooltip" data-placement="bottom" title="All online slaves"> 81 81 <td class="text-left">Total:</td> 82 <td class="text-right">{{status.MemoryStatus.TotalMemory | toGB}}</td>82 <td class="text-right">{{status.MemoryStatus.TotalMemory | kbToGB}} GB</td> 83 83 </tr> 84 84 <tr data-toggle="tooltip" data-placement="bottom" title="All calculating and idle slaves that are allowed to calculate"> 85 85 <td class="text-left">Active:</td> 86 <td class="text-right">{{status.MemoryStatus.ActiveMemory | toGB}}</td>86 <td class="text-right">{{status.MemoryStatus.ActiveMemory | kbToGB}} GB</td> 87 87 </tr> 88 88 <tr data-toggle="tooltip" data-placement="bottom" title="All calculating slaves that are allowed to calculate"> 89 89 <td class="text-left">Calculating:</td> 90 <td class="text-right">{{status.MemoryStatus. UsedMemory | toGB}}</td>90 <td class="text-right">{{status.MemoryStatus.CalculatingMemory | kbToGB}} GB</td> 91 91 </tr> 92 92 </table> … … 115 115 </tr> 116 116 </table> 117 </div> 118 </div> 119 </div> 120 </div> 121 122 <div class="row"> 123 <div class="col-lg-12"> 124 <div class="panel panel-default"> 125 <div class="panel-heading"> 126 <h3 class="panel-title">Status Overview</h3> 127 </div> 128 <div class="panel-body"> 129 <div class="row"> 130 <div class="col-md-6"> 131 <table class="table table-no-border table-condensed table-auto-width table-content"> 132 <tr> 133 <td class="text-left">Current Average Waiting Time:</td> 134 <td class="text-right">{{status.TimeStatus.AvgWaitingTime | toTimespan}}</td> 135 </tr> 136 <tr> 137 <td class="text-left">Total CPU Time:</td> 138 <td class="text-right">{{status.TimeStatus.TotalCpuTime | toTimespan}}</td> 139 </tr> 140 <tr> 141 <td class="text-left">Since:</td> 142 <td class="text-right">{{status.TimeStatus.BeginDate | toDate}}</td> 143 </tr> 144 </table> 145 </div> 146 <div class="col-md-6"> 147 <table class="table table-no-border table-condensed table-auto-width table-content"> 148 <tr> 149 <td class="text-left">Minimum Calculating Time:</td> 150 <td class="text-right">{{status.TimeStatus.MinCalculatingTime | toTimespan}}</td> 151 </tr> 152 <tr> 153 <td class="text-left">Maximum Calculating Time:</td> 154 <td class="text-right">{{status.TimeStatus.MaxCalculatingTime | toTimespan}}</td> 155 </tr> 156 <tr> 157 <td class="text-left">Average Calculating Time:</td> 158 <td class="text-right">{{status.TimeStatus.AvgCalculatingTime | toTimespan}}</td> 159 </tr> 160 <tr> 161 <td class="text-left">Standard Deviation Calculating Time:</td> 162 <td class="text-right">{{status.TimeStatus.StandardDeviationCalculatingTime | toTimespan}}</td> 163 </tr> 164 </table> 165 </div> 166 </div> 117 167 </div> 118 168 </div> … … 233 283 <td>{{slave.Slave.Name}}</td> 234 284 <td>{{slave.CpuUtilization | number: 2}} %</td> 235 <td>{{slave.Cores | number}}</td>236 <td>{{slave.Memory | toGB}}</td>285 <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td> 286 <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td> 237 287 </tr> 238 288 <tr ng-hide="activeCalculatingSlaves.length"> … … 291 341 <td>{{slave.Slave.Name}}</td> 292 342 <td>{{slave.CpuUtilization | number: 2}} %</td> 293 <td>{{slave.Cores | number}}</td>294 <td>{{slave.Memory | toGB}}</td>343 <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td> 344 <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td> 295 345 </tr> 296 346 <tr ng-hide="activeIdleSlaves.length"> … … 348 398 <td>{{slave.Slave.Name}}</td> 349 399 <td>{{slave.CpuUtilization | number: 2}} %</td> 350 <td>{{slave.Cores | number}}</td>351 <td>{{slave.Memory | toGB}}</td>400 <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td> 401 <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td> 352 402 </tr> 353 403 <tr ng-hide="inactiveSlaves.length"> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js
r12525 r12551 117 117 $scope.cpu.knobData = Math.round(status.CpuUtilizationStatus.ActiveCpuUtilization); 118 118 $scope.core.knobData = Math.round(status.CoreStatus.CalculatingCores / status.CoreStatus.ActiveCores * 100); 119 $scope.memory.knobData = Math.round(status.MemoryStatus. UsedMemory / status.MemoryStatus.ActiveMemory * 100);119 $scope.memory.knobData = Math.round(status.MemoryStatus.CalculatingMemory / status.MemoryStatus.ActiveMemory * 100); 120 120 // chart series 121 121 var cpuSeries = $scope.cpu.series[0].data.splice(0); … … 141 141 cpuSeries.push([$scope.status.Timestamp, $scope.cpu.knobData]); 142 142 143 // charts are currently filled with old total/used data144 // start temporary145 var usedCores = status.CoreStatus.TotalCores - status.CoreStatus.FreeCores;146 var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory;147 // end temporary148 143 coreSeries[0].push([$scope.status.Timestamp, status.CoreStatus.TotalCores]); 149 coreSeries[1].push([$scope.status.Timestamp, usedCores]);144 coreSeries[1].push([$scope.status.Timestamp, status.CoreStatus.UsedCores]); 150 145 memorySeries[0].push([$scope.status.Timestamp, Math.round(status.MemoryStatus.TotalMemory / 1024)]); 151 memorySeries[1].push([$scope.status.Timestamp, Math.round( usedMemory / 1024)]);146 memorySeries[1].push([$scope.status.Timestamp, Math.round(status.MemoryStatus.UsedMemory / 1024)]); 152 147 $scope.cpu.series = [{ data: cpuSeries, label: " CPU Utilization", color: "#f7921d" }]; 153 148 $scope.core.series = [ … … 174 169 for (var i = 0; i < noOfStatus; ++i) { 175 170 var curStatus = status[i]; 176 var cpuData = Math.round(curStatus.CpuUtilizationStatus. ActiveCpuUtilization);171 var cpuData = Math.round(curStatus.CpuUtilizationStatus.TotalCpuUtilization); 177 172 cpuSeries.push([curStatus.Timestamp, cpuData]); 178 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus. ActiveCores]);179 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus. CalculatingCores]);180 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus. ActiveMemory / 1024)]);173 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.TotalCores]); 174 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.UsedCores]); 175 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.TotalMemory / 1024)]); 181 176 memorySeries[1].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.UsedMemory / 1024)]); 182 177 } … … 202 197 }] 203 198 ); 204 205 module.filter('toGB', function () {206 return function (text, length, end) {207 if (text == null || text == '') text = '0';208 text = Math.round(parseInt(text) / 1024);209 return text + ' GB';210 };211 });212 213 199 })();
Note: See TracChangeset
for help on using the changeset viewer.