Skip to content

fix: capacity reported usage value #2028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2022
Merged

fix: capacity reported usage value #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions portal-ui/src/common/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,10 @@ export const niceBytesInt = (n: number, showK8sUnits: boolean = false) => {
while (n >= 1024 && ++l) {
n = n / 1024;
}
//include a decimal point and a tenths-place digit if presenting
//less than ten of KB or greater units
// include a decimal point and a tenths-place digit if presenting
// less than ten of KB or greater units
const k8sUnitsN = ["B", ...k8sUnits];
return (
n.toFixed(n < 10 && l > 0 ? 1 : 0) +
" " +
(showK8sUnits ? k8sUnitsN[l] : units[l])
);
return n.toFixed(1) + " " + (showK8sUnits ? k8sUnitsN[l] : units[l]);
};

export const setCookie = (name: string, val: string) => {
Expand Down
16 changes: 8 additions & 8 deletions portal-ui/src/screens/Console/Dashboard/Prometheus/Widgets/CapacityItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,19 @@ const CapacityItem = ({

const [middleLabel, unitValue] = (result?.innerLabel || "").split(" ");

const usedValueObj = dataInner[0];
const { value: usedValue = 0 } = usedValueObj || { value: 0 };
const usableValueObj = dataInner[0];
const { value: usableValue = 0 } = usableValueObj || { value: 0 };

const plotValues = [
{
value: parseInt(usedValue) * 5, //just for display
value: parseInt(usableValue),
color: "#D6D6D6",
label: "Free Space",
label: "Usable Space",
},
{
value: parseInt(usedValue),
value: parseInt(usableValue),
color: "#073052",
label: "Used Space",
label: "Usable Space",
},
];
return (
Expand Down Expand Up @@ -150,7 +150,7 @@ const CapacityItem = ({
fontSize: 12,
}}
>
{niceBytes(usedValue)}
{niceBytes(usableValue)}
<br />
<Box
sx={{
Expand All @@ -162,7 +162,7 @@ const CapacityItem = ({
textAlign: "center",
}}
>
Reported usage
Current Usable Capacity
</Box>
</Box>
<PieChart width={110} height={110}>
Expand Down
6 changes: 3 additions & 3 deletions portal-ui/src/screens/Console/Dashboard/Prometheus/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,14 +579,14 @@ export const widgetDetailsToPanel = (
const values = chartSeries.map((elementValue: any) => {
const values = get(elementValue, "values", []);
const metricKeyItem = Object.keys(elementValue.metric);

const sortResult = values.sort(
(value1: any[], value2: any[]) => value1[0] - value2[0]
(value1: any[], value2: any[]) =>
parseInt(value1[0][1]) - parseInt(value2[0][1])
);

const metricName = elementValue.metric[metricKeyItem[0]];
const value = sortResult[sortResult.length - 1];
return { name: metricName, value: parseInt(value) };
return { name: metricName, value: parseInt(value[1]) };
});

const innerLabel = panelItem.labelDisplayFunction
Expand Down