From 8ea6989ea49e36fa3d21aa42e5851235d19b0bb7 Mon Sep 17 00:00:00 2001 From: thehanatos Date: Tue, 2 Feb 2016 10:02:15 +0100 Subject: [PATCH] max, min and mean in the same function --- packages/xo-server-usage-report/src/index.js | 52 ++++++++++++++++---- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/packages/xo-server-usage-report/src/index.js b/packages/xo-server-usage-report/src/index.js index 6ef281049..adc48024c 100644 --- a/packages/xo-server-usage-report/src/index.js +++ b/packages/xo-server-usage-report/src/index.js @@ -86,22 +86,54 @@ class UsageReportPlugin { stats['salt_days'] = require('/home/thannos/xo-server/salt_days.json') // =================================================================== - // xo-cli generateCpuReport machine=lab1 this._unsets.push(this._xo.api.addMethod('generateCpuReport', ({ machine }) => { // TODO: compute and returns CPU mean, min & max. - })) - this._unsets.push(this._xo.api.addMethod('generateLoadMeanL1Days', () => { - return computeMean(parsedHostDaysLab1.stats.load) })) - - this._unsets.push(this._xo.api.addMethod('generateLoadMaxL1Days', () => { - return computeMax(parsedHostDaysLab1.stats.load) + this._unsets.push(this._xo.api.addMethod('generateLoadLab1', () => { + let maxLoad = computeMax(stats['lab1_days'].stats.load) + let minLoad = computeMin(stats['lab1_days'].stats.load) + let meanLoad = computeMean(stats['lab1_days'].stats.load) + // return `${maxLoad}${space}${minLoad}${space}${meanLoad}` + return { + 'max': maxLoad, + 'min': minLoad, + 'mean': meanLoad + } })) - - this._unsets.push(this._xo.api.addMethod('generateLoadMinL1Days', () => { - return computeMin(parsedHostDaysLab1.stats.load) + // memory + this._unsets.push(this._xo.api.addMethod('generateMemoryLab1', () => { + let maxMemory = computeMax(stats['lab1_days'].stats.memory) + let minMemory = computeMin(stats['lab1_days'].stats.memory) + let meanMemory = computeMean(stats['lab1_days'].stats.memory) + return { + 'max': maxMemory, + 'min': minMemory, + 'mean': meanMemory + } + })) + // memoryUsed + this._unsets.push(this._xo.api.addMethod('generateMemoryUsedLab1', () => { + let maxMemoryUsed = computeMax(stats['lab1_days'].stats.memoryUsed) + let minMemoryUsed = computeMin(stats['lab1_days'].stats.memoryUsed) + let meanMemoryUsed = computeMean(stats['lab1_days'].stats.memoryUsed) + return { + 'max': maxMemoryUsed, + 'min': minMemoryUsed, + 'mean': meanMemoryUsed + } + })) + // memoryFree + this._unsets.push(this._xo.api.addMethod('generateMemoryFreeLab1', () => { + let maxMemoryFree = computeMax(stats['lab1_days'].stats.memoryFree) + let minMemoryFree = computeMin(stats['lab1_days'].stats.memoryFree) + let meanMemoryFree = computeMean(stats['lab1_days'].stats.memoryFree) + return { + 'max': maxMemoryFree, + 'min': minMemoryFree, + 'mean': meanMemoryFree + } })) }