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

graphs: data can be x,y

Browse Source 
the labels approach is really needed only for category style
This commit is contained in:
Girish Ramakrishnan
2025-05-22 20:54:42 +02:00
parent e682a77858
commit c2678efc06
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dashboard/src/components/SystemMetrics.vue
View File

@@ -70,30 +70,38 @@ async function liveRefresh() {
}
async function getMetrics(fromSecs) {
if (fromSecs === 0) return { cpuLabels: [], cpuData: [], memoryLabels: [], memoryData: [], swapData: [] };
if (fromSecs === 0) return { cpuData: [], memoryData: [], swapData: [] };
const [error, result] = await systemModel.getMetrics({ fromSecs: fromSecs * 60 * 60, intervalSecs: 300 });
if (error) return console.error(error);
const cpuLabels = result.cpu.map(v => v[1]*1000); // convert to msecs
const cpuData = result.cpu.map(v => v[0]); // already scaled to cpu*100
// time is converted to msecs . cpu is already scaled to cpu*100
const cpuData = result.cpu.map(v => { return { x: v[1]*1000, y: v[0] };});
const memoryLabels = result.memory.map(v => v[1]*1000); // convert to msecs
const memoryData = result.memory.map(v => (v[0] / 1024 / 1024 / 1024).toFixed(2));
const memoryData = result.memory.map(v => {
return {
x: v[1]*1000,
y: (v[0] / 1024 / 1024 / 1024).toFixed(2)
};
});
// assume that there is 1:1 timeline for swap and memory data
const swapData = result.swap.map(v => (v[0] / 1024 / 1024 / 1024).toFixed(2));
const swapData = result.swap.map(v => {
return {
x: v[1]*1000,
y: (v[0] / 1024 / 1024 / 1024).toFixed(2)
};
});
return { cpuLabels, cpuData, memoryLabels, memoryData, swapData };
return { cpuData, memoryData, swapData };
}
async function refresh() {
busy.value = true;
const now = Date.now();
const { cpuLabels, cpuData, memoryLabels, memoryData, swapData } = await getMetrics(period.value);
const { cpuData, memoryData, swapData } = await getMetrics(period.value);
const cpuGraphData = {
labels: cpuLabels,
datasets: [{
label: 'CPU',
data: cpuData,
@@ -153,7 +161,6 @@ async function refresh() {
const roundedSwap = Math.ceil(systemMemory.swap / giB) * giB;
const memoryGraphData = {
labels: memoryLabels,
datasets: [{
label: 'RAM',
data: memoryData,