github/skooner
1
0
Fork 0
mirror of https://github.com/skooner-k8s/skooner.git synced 2026-04-27 11:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #148 from jmakhack/jmak-146

Browse Source 
#146: Fix units for node ram chart
This commit is contained in:
Eric Herbrandson
2020-10-03 18:42:36 -05:00
committed by GitHub
parent ed397ae606 62f3d6378a
commit 650b1bd783
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/components/nodeRamChart.tsx
View File

@@ -2,15 +2,25 @@ import _ from 'lodash';
import React from 'react';
import Chart from './chart';
import LoadingChart from './loadingChart';
import {parseRam, TO_GB} from '../utils/unitHelpers';
import {parseRam, parseUnitsOfRam} from '../utils/unitHelpers';
import {Node, Metrics} from '../utils/types';
export default function NodeRamChart({items, metrics}: {items?: Node[], metrics?: _.Dictionary<Metrics>}) {
const totals = getNodeRamTotals(items, metrics);
const used = parseUnitsOfRam(totals && totals.used);
const available = parseUnitsOfRam(totals && totals.available);
const decimals = used && used.value > 10 ? 1 : 2;
return (
<div className='charts_item'>
{totals ? (
<Chart used={totals.used} usedSuffix='Gb' available={totals.available} availableSuffix='Gb' />
<Chart
decimals={decimals}
used={used && used.value}
usedSuffix={used && used.unit}
available={available && available.value}
availableSuffix={available && available.unit}
/>
) : (
<LoadingChart />
)}
@@ -21,11 +31,11 @@ export default function NodeRamChart({items, metrics}: {items?: Node[], metrics?
}
function getNodeRamTotals(items?: Node[], metrics?: _.Dictionary<Metrics>) {
if (!items || !metrics) return null;
if (!items || !metrics) return;
const metricValues = Object.values(metrics);
const used = _.sumBy(metricValues, x => parseRam(x.usage.memory)) / TO_GB;
const available = _.sumBy(items, x => parseRam(x.status.capacity.memory)) / TO_GB;
const used = _.sumBy(metricValues, x => parseRam(x.usage.memory));
const available = _.sumBy(items, x => parseRam(x.status.capacity.memory));
return {used, available};
}

15
client/src/utils/unitHelpers.ts
View File

@@ -15,6 +15,21 @@ export function parseRam(value?: string) {
return parseUnitsOfBytes(value);
}
export function parseUnitsOfRam(bytes?: number) {
if (!bytes) return;
let i = 0;
while (bytes >= 1000 && i < UNITS.length - 1) {
i++;
bytes /= 1000; // eslint-disable-line no-param-reassign
}
return {
value: _.round(bytes, 2),
unit: i > 0 ? `${UNITS[i]}b` : 'b',
};
}
function parseUnitsOfBytes(value?: string) {
if (!value) return 0;