jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make it explicit what the graphs show in which units

Browse Source
This commit is contained in:
Johannes Zellner
2020-05-13 23:11:30 +02:00
parent e5c8f2caec
commit aef625ba31
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/app.html
+2 -6
View File
@@ -822,13 +822,9 @@
<li><a href="" ng-click="graphs.setPeriod(24*30, '30 days')">30 days</a></li>
</ul>
</div>
<br/>
<br/>
<label>CPU Usage</label>
<canvas id="graphsCPUUsageChart" style="width: 100%;"></canvas>
<label>Memory Usage</label>
<label style="margin-top: 10px;">Main Memory + Swap Usage in Megabytes</label>
<canvas id="graphsMemoryChart" style="width: 100%;"></canvas>
<label>Disk Usage</label>
<label>Disk Usage in Megabytes</label>
<canvas id="graphsDiskChart" style="width: 100%;"></canvas>
</div>
</div>
src/views/system.html
+1 -1
View File
@@ -102,7 +102,7 @@
<uib-tab index="1" heading="System Memory" select="graphs.show()">
<div class="card card-large" style="min-height: 300px;">
<label>Megabytes</label>
<label>Main Memory + Swap in Megabytes</label>
<canvas id="graphsSystemMemoryChart" style="width: 100%;"></canvas>
</div>
</uib-tab>
src/views/system.js
+3 -3
View File
@@ -331,13 +331,13 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
$scope.graphs[chartPropertyName] = new Chart(ctx, { type: 'line', data: data, options: options });
}
var systemMemoryuery = 'summarize(sum(collectd.localhost.memory.memory-used, collectd.localhost.swap.swap-used), "' + timeBucketSize + 'min", "avg")';
var systemMemoryQuery = 'summarize(sum(collectd.localhost.memory.memory-used, collectd.localhost.swap.swap-used), "' + timeBucketSize + 'min", "avg")';
var cpuQuery = 'summarize(sum(collectd.localhost.aggregation-cpu-average.cpu-system, collectd.localhost.aggregation-cpu-average.cpu-user), "' + timeBucketSize + 'min", "avg")';
Client.graphs([ systemMemoryuery, cpuQuery ], '-' + timePeriod + 'min', {}, function (error, result) {
Client.graphs([ systemMemoryQuery, cpuQuery ], '-' + timePeriod + 'min', {}, function (error, result) {
if (error) return console.error(error);
fillGraph('#graphsSystemMemoryChart', result[0], 'Memory', 'memoryChart', Number.parseInt($scope.memory.memory / 1024 / 1024), 1024 * 1024);
fillGraph('#graphsSystemMemoryChart', result[0], 'Memory', 'memoryChart', Number.parseInt(($scope.memory.memory + $scope.memory.swap) / 1024 / 1024), 1024 * 1024);
fillGraph('#graphsCPUChart', result[1], 'CPU Usage', 'cpuChart', 100, 1);
});
}